suzanne.soy/nixGL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use makeLibraryPath when appropriate

Browse Source
This commit is contained in:
Guillaume Bouchard 2020-04-26 15:24:26 +02:00
parent 33282d65db
commit 3ef7bffcae
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
default.nix
View File

@ -55,8 +55,8 @@ rec {
name = "nixGLNvidiaBumblebee";
text = ''
#!/usr/bin/env sh
export LD_LIBRARY_PATH=${nvidia}/lib:$LD_LIBRARY_PATH
${bumblebee}/bin/optirun --ldpath ${libglvnd}/lib:${nvidia}/lib "$@"
export LD_LIBRARY_PATH=${lib.makeLibraryPath [nvidia]}:$LD_LIBRARY_PATH
${bumblebee}/bin/optirun --ldpath ${lib.makeLibraryPath [libglvnd nvidia]} "$@"
'';
};
@ -83,8 +83,11 @@ rec {
name = "nixGLIntel";
text = ''
#!/usr/bin/env sh
export LIBGL_DRIVERS_PATH=${mesa_drivers}/lib/dri
export LD_LIBRARY_PATH=${mesa_drivers}/lib:$LD_LIBRARY_PATH
export LIBGL_DRIVERS_PATH=${lib.makeSearchPathOutput "lib" "lib/dri" [mesa_drivers]}
export LD_LIBRARY_PATH=${
lib.makeLibraryPath [
mesa_drivers]
}:$LD_LIBRARY_PATH
"$@"
'';
};