colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #197150 from LunNova/lunnova/prism-launcher-qt6

Browse Source
This commit is contained in:
Sandro 2022-10-26 21:56:29 +02:00 committed by GitHub
commit 45d1ffb078
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/games/prismlauncher/default.nix
View File

@ -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 = ''

4
pkgs/top-level/all-packages.nix
View File

@ -34313,7 +34313,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 { };