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

Compare commits

merge into: suzanne.soy:master
Branches Tags
suzanne.soy:master
suzanne.soy:patch-1
suzanne.soy:amdgpu
suzanne.soy:useGLVND
suzanne.soy:backport/noGLVND
suzanne.soy:atiVersion
...
pull from: suzanne.soy:useGLVND
Branches Tags
suzanne.soy:master
suzanne.soy:patch-1
suzanne.soy:amdgpu
suzanne.soy:useGLVND
suzanne.soy:backport/noGLVND
suzanne.soy:atiVersion

2 Commits
master ... useGLVND

Author SHA1 Message Date
Guillaume Bouchard
758ac7f57b Add documentation for legacy driver now that we switch to GLVND 2018-07-10 03:33:40 +02:00
Guillaume Bouchard
103e0cd30b Use GLVND 
This fixes missing symbols
 2018-07-10 03:07:48 +02:00
2 changed files with 7 additions and 3 deletions
Show Stats Expand all files Collapse all files

4
README.md
View File

@ -181,6 +181,10 @@ If by any chance it does not work, you need to install nixGL using the same nixp
NIX_PATH=nixpkgs=https://github.com/nixos/nixpkgs/archive/94d80eb72474bf8243b841058ce45eac2b163943.tar.gz nix build -f ./default.nix nixGLIntel NIX_PATH=nixpkgs=https://github.com/nixos/nixpkgs/archive/94d80eb72474bf8243b841058ce45eac2b163943.tar.gz nix build -f ./default.nix nixGLIntel
``` ```
# Old nvidia drivers
Users of nvidia legacy driver should use the `backport/noGLVND` branch.
# `nixGLCommon` # `nixGLCommon`
`nixGLCommon nixGLXXX` can be used to get `nixGL` executable which fallsback to `nixGLXXX`. It is a shorter name for people with only one OpenGL configuration. `nixGLCommon nixGLXXX` can be used to get `nixGL` executable which fallsback to `nixGLXXX`. It is a shorter name for people with only one OpenGL configuration.

6
default.nix
View File

@ -16,7 +16,7 @@ let
url = "http://download.nvidia.com/XFree86/Linux-x86_64/${nvidiaVersion}/NVIDIA-Linux-x86_64-${nvidiaVersion}.run"; url = "http://download.nvidia.com/XFree86/Linux-x86_64/${nvidiaVersion}/NVIDIA-Linux-x86_64-${nvidiaVersion}.run";
sha256 = nvidiaHash; sha256 = nvidiaHash;
}; };
useGLVND = false; useGLVND = true;
}); });
}; };
}; };
@ -44,7 +44,7 @@ rec {
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
${bumblebee}/bin/optirun --ldpath ${nvidia}/lib "\$@" ${bumblebee}/bin/optirun --ldpath ${libglvnd}/lib:${nvidia}/lib "\$@"
FOO FOO
chmod u+x $out/bin/nixGLNvidiaBumblebee chmod u+x $out/bin/nixGLNvidiaBumblebee
@ -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=${nvidiaLibsOnly}/lib export LD_LIBRARY_PATH=${libglvnd}/lib:${nvidiaLibsOnly}/lib
"\$@" "\$@"
FOO FOO