Merge pull request #197150 from LunNova/lunnova/prism-launcher-qt6
This commit is contained in:
commit
45d1ffb078
|
@ -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 = ''
|
||||
|
|
|
@ -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 { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue