summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSefa Eyeoglu <contact@scrumplex.net>2023-08-09 20:32:50 +0200
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2023-08-17 17:05:18 +0000
commitfceea98adaa012f8437d8f5b2d137439be339f3c (patch)
tree18040a623149efef6b7015315e97c405bff7ca08
parentprismlauncher: add mesa-demos to PATH (diff)
downloadnixpkgs-origin/backport-238645-to-release-23.05.tar.gz
prismlauncher: rename to programs/libs runtimePrograms/runtimeLibsorigin/backport-238645-to-release-23.05
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net> (cherry picked from commit dc958682e9342d32d8f587977f8a33a6747fdb2a)
-rw-r--r--pkgs/games/prismlauncher/wrapper.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/games/prismlauncher/wrapper.nix b/pkgs/games/prismlauncher/wrapper.nix
index 7a56be534307..240deec4e2fe 100644
--- a/pkgs/games/prismlauncher/wrapper.nix
+++ b/pkgs/games/prismlauncher/wrapper.nix
@@ -50,7 +50,7 @@ symlinkJoin {
qtWrapperArgs =
let
- libs = (with xorg; [
+ runtimeLibs = (with xorg; [
libX11
libXext
libXcursor
@@ -68,18 +68,18 @@ symlinkJoin {
++ lib.optional textToSpeechSupport flite
++ additionalLibs;
- programs = [
+ runtimePrograms = [
xorg.xrandr
- mesa-demos # need glxinfo
+ mesa-demos # need glxinfo
]
++ additionalPrograms;
in
[ "--prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}" ]
++ lib.optionals stdenv.isLinux [
- "--set LD_LIBRARY_PATH /run/opengl-driver/lib:${lib.makeLibraryPath libs}"
+ "--set LD_LIBRARY_PATH /run/opengl-driver/lib:${lib.makeLibraryPath runtimeLibs}"
# xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
- "--prefix PATH : ${lib.makeBinPath programs}"
+ "--prefix PATH : ${lib.makeBinPath runtimePrograms}"
];
inherit (prismlauncherFinal) meta;