Merge pull request #1666 from getchoo/driverlink
[Linux] Use addOpenGLRunpath.driverLink in Nix wrapper
This commit is contained in:
commit
589ab24f7e
@ -4,6 +4,7 @@
|
|||||||
symlinkJoin,
|
symlinkJoin,
|
||||||
prismlauncher-unwrapped,
|
prismlauncher-unwrapped,
|
||||||
wrapQtAppsHook,
|
wrapQtAppsHook,
|
||||||
|
addOpenGLRunpath,
|
||||||
qtbase, # needed for wrapQtAppsHook
|
qtbase, # needed for wrapQtAppsHook
|
||||||
qtsvg,
|
qtsvg,
|
||||||
qtwayland,
|
qtwayland,
|
||||||
@ -85,7 +86,7 @@ in
|
|||||||
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 runtimeLibs}"
|
"--set LD_LIBRARY_PATH ${addOpenGLRunpath.driverLink}/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 runtimePrograms}"
|
"--prefix PATH : ${lib.makeBinPath runtimePrograms}"
|
||||||
];
|
];
|
||||||
|
Loading…
Reference in New Issue
Block a user