diff options
| author | flow <flowlnlnln@gmail.com> | 2022-07-19 11:28:08 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-19 11:28:08 -0300 |
| commit | c86610b917d2935426c0813bead01b610b913fae (patch) | |
| tree | 6fd75f80f34bac504bcf0708ab6ad55f37f4adaa | |
| parent | 502750492c0d9b31400228c53d86787c2f2a15ac (diff) | |
| parent | 6841ebc31d1d2773f2d9997f877d05ef66494dc9 (diff) | |
| download | PrismLauncher-c86610b917d2935426c0813bead01b610b913fae.tar.gz PrismLauncher-c86610b917d2935426c0813bead01b610b913fae.tar.bz2 PrismLauncher-c86610b917d2935426c0813bead01b610b913fae.zip | |
Merge pull request #934 from virchau13/fix-non-nixos-libraries
fix(nix): only load stdenv.cc.cc.lib on NixOS
| -rw-r--r-- | nix/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nix/default.nix b/nix/default.nix index 12ac0165..1a6b9e44 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -34,7 +34,6 @@ let libXxf86vm libpulseaudio libGL - stdenv.cc.cc.lib ]; # This variable will be passed to Minecraft by PolyMC @@ -68,10 +67,12 @@ stdenv.mkDerivation rec { ] ++ lib.optionals enableLTO [ "-DENABLE_LTO=on" ] ++ lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ]; + # we have to check if the system is NixOS before adding stdenv.cc.cc.lib (#923) postInstall = '' # 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} \ + --run '[ -f /etc/NIXOS ] && export GAME_LIBRARY_PATH="${stdenv.cc.cc.lib}/lib"' \ + --prefix GAME_LIBRARY_PATH : ${gameLibraryPath} \ --prefix POLYMC_JAVA_PATHS : ${javaPaths} \ --prefix PATH : ${lib.makeBinPath [ xorg.xrandr ]} ''; |