diff options
author | txtsd <thexerothermicsclerodermoid@gmail.com> | 2022-06-09 05:57:23 +0530 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-09 05:57:23 +0530 |
commit | 705cf6499ea618a278d1941215fec2160161e5ae (patch) | |
tree | 15fc7639cf3d665d515af5cf1b45d383b5ab305c /nix | |
parent | 896636464822b162fa045ba4f592ce4adb8f3fbc (diff) | |
parent | 3f1251e78bf57df756060c341dcd5a607a47ebcc (diff) | |
download | PrismLauncher-705cf6499ea618a278d1941215fec2160161e5ae.tar.gz PrismLauncher-705cf6499ea618a278d1941215fec2160161e5ae.tar.bz2 PrismLauncher-705cf6499ea618a278d1941215fec2160161e5ae.zip |
Merge pull request #734 from babbaj/extra-jdks
nix: add package argument for extra jdks
Diffstat (limited to 'nix')
-rw-r--r-- | nix/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nix/default.nix b/nix/default.nix index 969b455e..d6aa370c 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -14,6 +14,7 @@ , quazip , libGL , msaClientID ? "" +, extraJDKs ? [ ] # flake , self @@ -36,6 +37,8 @@ let # This variable will be passed to Minecraft by PolyMC gameLibraryPath = libpath + ":/run/opengl-driver/lib"; + + javaPaths = lib.makeSearchPath "bin/java" ([ jdk jdk8 ] ++ extraJDKs); in stdenv.mkDerivation rec { @@ -67,7 +70,7 @@ stdenv.mkDerivation rec { # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 wrapQtApp $out/bin/polymc \ --set GAME_LIBRARY_PATH ${gameLibraryPath} \ - --prefix POLYMC_JAVA_PATHS : ${jdk}/lib/openjdk/bin/java:${jdk8}/lib/openjdk/bin/java \ + --prefix POLYMC_JAVA_PATHS : ${javaPaths} \ --prefix PATH : ${lib.makeBinPath [ xorg.xrandr ]} ''; |