From a7f6c1dd96e2fccc5055dfe2568dd6381ab245e7 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Fri, 21 Oct 2022 18:43:10 -0700 Subject: [PATCH 1/2] prismlauncher: pass -DLauncher_QT_VERSION_MAJOR=6 on qt6, add qtsvg dep for icons --- pkgs/games/prismlauncher/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/games/prismlauncher/default.nix b/pkgs/games/prismlauncher/default.nix index a7797861f30a..f839f6314eaf 100644 --- a/pkgs/games/prismlauncher/default.nix +++ b/pkgs/games/prismlauncher/default.nix @@ -10,6 +10,7 @@ , xorg , libpulseaudio , qtbase +, qtsvg , libGL , quazip , glfw @@ -41,9 +42,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ extra-cmake-modules ghc_filesystem cmake file jdk wrapQtAppsHook ]; - buildInputs = [ qtbase zlib quazip tomlplusplus ]; + buildInputs = [ qtbase qtsvg zlib quazip tomlplusplus ]; - cmakeFlags = lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ]; + cmakeFlags = lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ] + ++ lib.optionals (lib.versionAtLeast qtbase.version "6") [ "-DLauncher_QT_VERSION_MAJOR=6" ]; dontWrapQtApps = true; postUnpack = '' From 2a4f267ce4f61c9292f5fc6e612321be9df2c33a Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Fri, 21 Oct 2022 18:37:35 -0700 Subject: [PATCH 2/2] prismlauncher,prismlauncher-qt5: add separate qt5 and qt6 aliases This one shouldn't get backported because qt6 packaging has a bunch of unresolved issues in 22.05 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 87352531ddf6..235cd0114503 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34254,7 +34254,9 @@ with pkgs; planetary_annihilation = callPackage ../games/planetaryannihilation { }; - prismlauncher = libsForQt5.callPackage ../games/prismlauncher { }; + prismlauncher-qt5 = libsForQt5.callPackage ../games/prismlauncher { }; + + prismlauncher = qt6Packages.callPackage ../games/prismlauncher { }; pong3d = callPackage ../games/pong3d { };