diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-03-12 17:21:00 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-03-12 17:21:00 +0100 |
| commit | 1f7eeea8ee7eb32eb956a80ce747dcbb4c75a67f (patch) | |
| tree | 212d1e84809195384ddb5bdf4731dac2df5b3b69 /pkgs/games | |
| parent | 5abe72f0b2efdd4958acb26e903973d3c624adf2 (diff) | |
| parent | 8f1e87b4f4b47981be2ec1fc72553189e5880a53 (diff) | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/prismlauncher/default.nix | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/games/prismlauncher/default.nix b/pkgs/games/prismlauncher/default.nix index 4abd40e24ab04..b3875245f8726 100644 --- a/pkgs/games/prismlauncher/default.nix +++ b/pkgs/games/prismlauncher/default.nix @@ -55,7 +55,6 @@ stdenv.mkDerivation rec { cmakeFlags = lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ] ++ lib.optionals (lib.versionAtLeast qtbase.version "6") [ "-DLauncher_QT_VERSION_MAJOR=6" ]; - dontWrapQtApps = true; postUnpack = '' rm -rf source/libraries/libnbtplusplus @@ -65,7 +64,7 @@ stdenv.mkDerivation rec { chown -R $USER: source/libraries/libnbtplusplus ''; - postInstall = + qtWrapperArgs = let libpath = with xorg; lib.makeLibraryPath [ @@ -81,13 +80,12 @@ stdenv.mkDerivation rec { stdenv.cc.cc.lib ]; 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/"; |