refactor(nix): use qtWrapperArgs
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
This commit is contained in:
		| @@ -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/"; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user