diff options
| author | timoreo22 <timo.oreo34@gmail.com> | 2022-02-26 07:34:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-26 07:34:19 +0100 |
| commit | 692b9cf0e0efd00e3f5bc0bbdc4e517010c7773a (patch) | |
| tree | decc27baf4f366fd49515bdd862ed871c7e62e08 | |
| parent | ae354688c96927e95db8c06c53ada0b5d7e77f26 (diff) | |
| parent | e8929599a52a7df3a67b76fd7bf586a219030247 (diff) | |
| download | PrismLauncher-692b9cf0e0efd00e3f5bc0bbdc4e517010c7773a.tar.gz PrismLauncher-692b9cf0e0efd00e3f5bc0bbdc4e517010c7773a.tar.bz2 PrismLauncher-692b9cf0e0efd00e3f5bc0bbdc4e517010c7773a.zip | |
Merge pull request #195 from babbaj/nix-refactor
nix: Use POLYMC_JAVA_PATHS
| -rw-r--r-- | packages/nix/polymc/default.nix | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/packages/nix/polymc/default.nix b/packages/nix/polymc/default.nix index a9610017..9a986be4 100644 --- a/packages/nix/polymc/default.nix +++ b/packages/nix/polymc/default.nix @@ -47,12 +47,7 @@ mkDerivation rec { dontWrapQtApps = true; - postPatch = '' - # hardcode jdk paths - substituteInPlace launcher/java/JavaUtils.cpp \ - --replace 'scanJavaDir("/usr/lib/jvm")' 'javas.append("${jdk}/lib/openjdk/bin/java")' \ - --replace 'scanJavaDir("/usr/lib32/jvm")' 'javas.append("${jdk8}/lib/openjdk/bin/java")' - '' + lib.optionalString (msaClientID != "") '' + postPatch = lib.optionalString (msaClientID != "") '' # add client ID substituteInPlace CMakeLists.txt \ --replace '17b47edd-c884-4997-926d-9e7f9a6b4647' '${msaClientID}' @@ -77,6 +72,7 @@ mkDerivation rec { wrapProgram $out/bin/polymc \ "''${qtWrapperArgs[@]}" \ --set GAME_LIBRARY_PATH ${gameLibraryPath} \ + --prefix POLYMC_JAVA_PATHS : ${jdk}/lib/openjdk/bin/java:${jdk8}/lib/openjdk/bin/java \ --prefix PATH : ${lib.makeBinPath [ xorg.xrandr ]} ''; |