Preserve system LD_LIBRARY_PATH
This commit is contained in:
parent
a02970d696
commit
04a6b0833f
|
@ -43,7 +43,7 @@ rec {
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
cat > $out/bin/nixGLNvidiaBumblebee << FOO
|
cat > $out/bin/nixGLNvidiaBumblebee << FOO
|
||||||
#!/usr/bin/env sh
|
#!/usr/bin/env sh
|
||||||
export LD_LIBRARY_PATH=${nvidia}/lib
|
export LD_LIBRARY_PATH=${nvidia}/lib:\$LD_LIBRARY_PATH
|
||||||
${bumblebee}/bin/optirun --ldpath ${libglvnd}/lib:${nvidia}/lib "\$@"
|
${bumblebee}/bin/optirun --ldpath ${libglvnd}/lib:${nvidia}/lib "\$@"
|
||||||
FOO
|
FOO
|
||||||
|
|
||||||
|
@ -61,7 +61,7 @@ rec {
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
cat > $out/bin/nix${api}Nvidia << FOO
|
cat > $out/bin/nix${api}Nvidia << FOO
|
||||||
#!/usr/bin/env sh
|
#!/usr/bin/env sh
|
||||||
export LD_LIBRARY_PATH=${libglvnd}/lib:${nvidiaLibsOnly}/lib
|
export LD_LIBRARY_PATH=${libglvnd}/lib:${nvidiaLibsOnly}/lib:\$LD_LIBRARY_PATH
|
||||||
"\$@"
|
"\$@"
|
||||||
FOO
|
FOO
|
||||||
|
|
||||||
|
@ -84,7 +84,7 @@ rec {
|
||||||
cat > $out/bin/nixGLIntel << FOO
|
cat > $out/bin/nixGLIntel << FOO
|
||||||
#!/usr/bin/env sh
|
#!/usr/bin/env sh
|
||||||
export LIBGL_DRIVERS_PATH=${mesa_drivers}/lib/dri
|
export LIBGL_DRIVERS_PATH=${mesa_drivers}/lib/dri
|
||||||
export LD_LIBRARY_PATH=${mesa_drivers}/lib
|
export LD_LIBRARY_PATH=${mesa_drivers}/lib:\$LD_LIBRARY_PATH
|
||||||
"\$@"
|
"\$@"
|
||||||
FOO
|
FOO
|
||||||
|
|
||||||
|
@ -111,7 +111,7 @@ rec {
|
||||||
xorg.libxshmfence
|
xorg.libxshmfence
|
||||||
wayland
|
wayland
|
||||||
gcc.cc
|
gcc.cc
|
||||||
]}
|
]}:\$LD_LIBRARY_PATH
|
||||||
exec "\$@"
|
exec "\$@"
|
||||||
EOF
|
EOF
|
||||||
chmod u+x "$out/bin/nixVulkanIntel"
|
chmod u+x "$out/bin/nixVulkanIntel"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user