diff options
| -rw-r--r-- | nix/default.nix | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/nix/default.nix b/nix/default.nix index cd782f90..f219d5d2 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -50,7 +50,6 @@ stdenv.mkDerivation rec { cmakeFlags = lib.optionals (msaClientID != "") ["-DLauncher_MSA_CLIENT_ID=${msaClientID}"] ++ lib.optionals (lib.versionOlder qtbase.version "6") ["-DLauncher_QT_VERSION_MAJOR=5"]; - dontWrapQtApps = true; postUnpack = '' rm -rf source/libraries/libnbtplusplus @@ -60,7 +59,7 @@ stdenv.mkDerivation rec { chown -R $USER: source/libraries/libnbtplusplus ''; - postInstall = let + qtWrapperArgs = let libpath = with xorg; lib.makeLibraryPath [ libX11 @@ -74,13 +73,12 @@ stdenv.mkDerivation rec { openal stdenv.cc.cc.lib ]; - in '' + in [ + "--set LD_LIBRARY_PATH /run/opengl-driver/lib:${libpath}" + "--prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}" # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 - wrapQtApp $out/bin/prismlauncher \ - --set LD_LIBRARY_PATH /run/opengl-driver/lib:${libpath} \ - --prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks} \ - --prefix PATH : ${lib.makeBinPath [xorg.xrandr]} - ''; + "--prefix PATH : ${lib.makeBinPath [xorg.xrandr]}" + ]; meta = with lib; { homepage = "https://prismlauncher.org/"; |