prismlauncher: rename to programs/libs runtimePrograms/runtimeLibs

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
This commit is contained in:
Sefa Eyeoglu 2023-08-09 20:32:50 +02:00 committed by Jörg Thalheim
parent 921102518a
commit a1a757feb8

View file

@ -50,7 +50,7 @@ symlinkJoin {
qtWrapperArgs = qtWrapperArgs =
let let
libs = (with xorg; [ runtimeLibs = (with xorg; [
libX11 libX11
libXext libXext
libXcursor libXcursor
@ -68,18 +68,18 @@ symlinkJoin {
++ lib.optional textToSpeechSupport flite ++ lib.optional textToSpeechSupport flite
++ additionalLibs; ++ additionalLibs;
programs = [ runtimePrograms = [
xorg.xrandr xorg.xrandr
mesa-demos # need glxinfo mesa-demos # need glxinfo
] ]
++ additionalPrograms; ++ additionalPrograms;
in in
[ "--prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}" ] [ "--prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}" ]
++ lib.optionals stdenv.isLinux [ ++ 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 # 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; inherit (prismlauncherFinal) meta;