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

Fix 32 bits for nvidia and nvidia bumblebee

Browse Source 
I was able to test for nvidia bumblebee.
This commit is contained in:
Guillaume Bouchard 2020-04-26 23:45:55 +02:00
parent d5c0d28968
commit 66c92824ab
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
default.nix
View File

@ -88,13 +88,12 @@ rec {
kernel = null; kernel = null;
}; };
# TODO: 32bit version? Looks like it works fine without anything special.
nixGLNvidiaBumblebee = addNvidiaVersion (writeExecutable { nixGLNvidiaBumblebee = addNvidiaVersion (writeExecutable {
name = "nixGLNvidiaBumblebee"; name = "nixGLNvidiaBumblebee";
text = '' text = ''
#!/usr/bin/env sh #!/usr/bin/env sh
export LD_LIBRARY_PATH=${lib.makeLibraryPath [nvidia]}:$LD_LIBRARY_PATH export LD_LIBRARY_PATH=${lib.makeLibraryPath [nvidia]}:$LD_LIBRARY_PATH
${bumblebee}/bin/optirun --ldpath ${lib.makeLibraryPath [libglvnd nvidia]} "$@" ${bumblebee}/bin/optirun --ldpath ${lib.makeLibraryPath ([libglvnd nvidia] ++ lib.optionals enable32bits [nvidia.lib32 pkgsi686Linux.libglvnd])} "$@"
''; '';
}); });
@ -108,7 +107,8 @@ rec {
export LD_LIBRARY_PATH=${lib.makeLibraryPath ([ export LD_LIBRARY_PATH=${lib.makeLibraryPath ([
libglvnd libglvnd
nvidiaLibsOnly nvidiaLibsOnly
] ++ lib.optional (api == "Vulkan") nixpkgs.vulkan-validation-layers) ] ++ lib.optional (api == "Vulkan") nixpkgs.vulkan-validation-layers
++ lib.optionals enable32bits [nvidiaLibsOnly.lib32 pkgsi686Linux.libglvnd])
}:''${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} }:''${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
"$@" "$@"
''; '';