diff options
| author | flow <flowlnlnln@gmail.com> | 2023-04-07 06:51:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-07 06:51:14 -0700 |
| commit | ed085630db63401ac50d26403d953f5d9993b9ce (patch) | |
| tree | 6b50521026b76af8e3d8e24a9e138d033cb4a155 | |
| parent | 74d5c7c1a4cdfc8462c04524c84dc35b7d7fa2f2 (diff) | |
| parent | 70364884a963d35234711c750fd6abdc6ebfb635 (diff) | |
| download | PrismLauncher-ed085630db63401ac50d26403d953f5d9993b9ce.tar.gz PrismLauncher-ed085630db63401ac50d26403d953f5d9993b9ce.tar.bz2 PrismLauncher-ed085630db63401ac50d26403d953f5d9993b9ce.zip | |
Merge pull request #968 from Scrumplex/nix/sync-2023-04-02
| -rw-r--r-- | nix/default.nix | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/nix/default.nix b/nix/default.nix index cd782f90..e0616b6e 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -23,6 +23,8 @@ cmark, msaClientID ? "", jdks ? [jdk17 jdk8], + gamemodeSupport ? true, + gamemode, # flake self, version, @@ -45,12 +47,12 @@ stdenv.mkDerivation rec { tomlplusplus cmark ] - ++ 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}"] ++ lib.optionals (lib.versionOlder qtbase.version "6") ["-DLauncher_QT_VERSION_MAJOR=5"]; - dontWrapQtApps = true; postUnpack = '' rm -rf source/libraries/libnbtplusplus @@ -60,27 +62,27 @@ stdenv.mkDerivation rec { chown -R $USER: source/libraries/libnbtplusplus ''; - postInstall = let + qtWrapperArgs = let libpath = with xorg; - lib.makeLibraryPath [ - libX11 - libXext - libXcursor - libXrandr - libXxf86vm - libpulseaudio - libGL - glfw - openal - stdenv.cc.cc.lib - ]; - in '' + lib.makeLibraryPath ([ + libX11 + libXext + libXcursor + libXrandr + libXxf86vm + libpulseaudio + libGL + glfw + openal + stdenv.cc.cc.lib + ] + ++ lib.optional gamemodeSupport gamemode.lib); + 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/"; |