this repo has no description
Fix libGL.so loading on Nix (#20)
* don't check for updates on Nix and preview builds
* use -mx2G on Nix also
* add libGL dependency
authored by
Alex Bates
and committed by
GitHub
5b152472
6f302c5a
+8
-4
+2
-2
flake.lock
+2
-2
flake.lock
···
21
21
"nixpkgs": {
22
22
"locked": {
23
23
"lastModified": 0,
24
-
"narHash": "sha256-FVZKU8VYNST8+LKQBt1Nij9FAXEDufXGgFbg26wqmZk=",
25
-
"path": "/nix/store/fgwbzb1zisl9kjfqnbhkpyk71xfsg6qa-source",
24
+
"narHash": "sha256-PwQASeL2cGVmrtQYlrBur0U20Xy07uSWVnFup2PHnDs=",
25
+
"path": "/nix/store/z88hhaq46sdqzkm0zas1sn284h7w87k9-source",
26
26
"type": "path"
27
27
},
28
28
"original": {
+5
-1
flake.nix
+5
-1
flake.nix
···
11
11
forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: f {
12
12
pkgs = import nixpkgs { inherit system; };
13
13
});
14
+
makeLibPath = pkgs: (with pkgs; lib.makeLibraryPath [
15
+
libGL
16
+
]);
14
17
in {
15
18
devShells = forEachSupportedSystem ({ pkgs }: let
16
19
jdk = pkgs."jdk${toString javaVersion}";
···
31
34
export JAVA_TOOL_OPTIONS="${loadLombok}${prev}"
32
35
export JAVA_HOME="${jdk}"
33
36
export GRADLE_HOME="${gradle}"
37
+
export LD_LIBRARY_PATH="${makeLibPath pkgs}"
34
38
'';
35
39
};
36
40
});
···
81
85
82
86
mkdir -p $out/bin
83
87
makeWrapper ${pkgs.jre}/bin/java $out/bin/${pname} \
84
-
--add-flags "-cp $out/share/java/StarRod.jar app.StarRodMain"
88
+
--add-flags "-cp $out/share/java/StarRod.jar -mx2G -Djava.library.path=${makeLibPath pkgs} app.StarRodMain"
85
89
86
90
# TODO: icon
87
91
#install -Dm444 logo_512.png $out/share/icons/hicolor/512x512/apps/${pname}.png
+1
-1
src/main/java/app/Environment.java
+1
-1
src/main/java/app/Environment.java
···
232
232
// UIManager.put("TabbedPane.showTabSeparators", true);
233
233
// UIManager.put("TabbedPane.tabSeparatorsFullHeight", true);
234
234
235
-
if (fromJar && mainConfig.getBoolean(Options.CheckForUpdates))
235
+
if (fromJar && gitBuildTag != null && mainConfig.getBoolean(Options.CheckForUpdates))
236
236
checkForUpdate();
237
237
}
238
238