Merge pull request #223908 from Scrumplex/fix-prismlauncher-gamemode

This commit is contained in:
Sandro 2023-04-07 01:24:16 +02:00 committed by GitHub
commit b88ebd492a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -22,6 +22,8 @@
, ghc_filesystem , ghc_filesystem
, msaClientID ? "" , msaClientID ? ""
, jdks ? [ jdk17 jdk8 ] , jdks ? [ jdk17 jdk8 ]
, gamemodeSupport ? true
, gamemode
}: }:
let let
@ -52,7 +54,9 @@ stdenv.mkDerivation rec {
quazip quazip
ghc_filesystem ghc_filesystem
tomlplusplus tomlplusplus
] ++ lib.optional (lib.versionAtLeast qtbase.version "6") qtwayland; ]
++ lib.optional (lib.versionAtLeast qtbase.version "6") qtwayland
++ lib.optional gamemodeSupport gamemode.dev;
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" ]; ++ lib.optionals (lib.versionAtLeast qtbase.version "6") [ "-DLauncher_QT_VERSION_MAJOR=6" ];
@ -68,7 +72,7 @@ stdenv.mkDerivation rec {
qtWrapperArgs = qtWrapperArgs =
let let
libpath = with xorg; libpath = with xorg;
lib.makeLibraryPath [ lib.makeLibraryPath ([
libX11 libX11
libXext libXext
libXcursor libXcursor
@ -79,7 +83,7 @@ stdenv.mkDerivation rec {
glfw glfw
openal openal
stdenv.cc.cc.lib stdenv.cc.cc.lib
]; ] ++ lib.optional gamemodeSupport gamemode.lib);
in in
[ [
"--set LD_LIBRARY_PATH /run/opengl-driver/lib:${libpath}" "--set LD_LIBRARY_PATH /run/opengl-driver/lib:${libpath}"