diff options
| author | kumquat-ir <66188216+kumquat-ir@users.noreply.github.com> | 2022-07-31 14:54:50 -0400 |
|---|---|---|
| committer | kumquat-ir <66188216+kumquat-ir@users.noreply.github.com> | 2022-07-31 14:54:50 -0400 |
| commit | 579582740e9efd5a054b02a8b0e1d8999abfa6fa (patch) | |
| tree | 5b07ba3387dfebabd68e534d79f7bf7363aad67c /nix | |
| parent | 20b1723e78149c1f2ac4072cbd46997e9c5160fa (diff) | |
| parent | b15544c163ccbca08ea498b3b3a51c82d7fb3e12 (diff) | |
| download | PrismLauncher-579582740e9efd5a054b02a8b0e1d8999abfa6fa.tar.gz PrismLauncher-579582740e9efd5a054b02a8b0e1d8999abfa6fa.tar.bz2 PrismLauncher-579582740e9efd5a054b02a8b0e1d8999abfa6fa.zip | |
Merge remote-tracking branch 'origin/develop' into download-all-blocked
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/nix/default.nix b/nix/default.nix index 12ac0165..42ddda18 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,16 +67,20 @@ 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 LD_LIBRARY_PATH="${stdenv.cc.cc.lib}/lib:$LD_LIBRARY_PATH"' \ + --prefix LD_LIBRARY_PATH : ${gameLibraryPath} \ --prefix POLYMC_JAVA_PATHS : ${javaPaths} \ --prefix PATH : ${lib.makeBinPath [ xorg.xrandr ]} ''; meta = with lib; { homepage = "https://polymc.org/"; + downloadPage = "https://polymc.org/download/"; + changelog = "https://github.com/PolyMC/PolyMC/releases"; description = "A free, open source launcher for Minecraft"; longDescription = '' Allows you to have multiple, separate instances of Minecraft (each with @@ -85,7 +88,7 @@ stdenv.mkDerivation rec { their associated options with a simple interface. ''; platforms = platforms.unix; - license = licenses.gpl3Plus; + license = licenses.gpl3Only; maintainers = with maintainers; [ starcraft66 kloenk ]; }; } |