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

Merge pull request #4 from guibou/noglvnd

Browse Source 
Remove glVND dependency. Fix for #3
This commit is contained in:
Guillaume Bouchard 2018-02-26 16:17:38 +01:00 committed by GitHub
commit d3d9f07d02
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
default.nix
View File

@ -18,10 +18,11 @@ rec {
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 = null; sha256 = null;
}; };
useGLVND = 0;
}); });
nixGLNvidiaBumblebee = runCommand "nixGLNvidiaBumblebee-${version}" { nixGLNvidiaBumblebee = runCommand "nixGLNvidiaBumblebee-${version}" {
buildInputs = [ libglvnd nvidiaLibsOnly bumblebee ]; buildInputs = [ nvidiaLibsOnly bumblebee ];
meta = with pkgs.stdenv.lib; { meta = with pkgs.stdenv.lib; {
description = "A tool to launch OpenGL application on system other than NixOS - Nvidia bumblebee version"; description = "A tool to launch OpenGL application on system other than NixOS - Nvidia bumblebee version";
@ -32,14 +33,14 @@ rec {
cat > $out/bin/nixGLNvidiaBumblebee << FOO cat > $out/bin/nixGLNvidiaBumblebee << FOO
#!/usr/bin/env sh #!/usr/bin/env sh
export LD_LIBRARY_PATH=${nvidiaLibsOnly}/lib export LD_LIBRARY_PATH=${nvidiaLibsOnly}/lib
${bumblebee}/bin/optirun --ldpath ${libglvnd}/lib "\$@" ${bumblebee}/bin/optirun "\$@"
FOO FOO
chmod u+x $out/bin/nixGLNvidiaBumblebee chmod u+x $out/bin/nixGLNvidiaBumblebee
''; '';
nixGLNvidia = runCommand "nixGLNvidia-${version}" { nixGLNvidia = runCommand "nixGLNvidia-${version}" {
buildInputs = [ libglvnd nvidiaLibsOnly ]; buildInputs = [ nvidiaLibsOnly ];
meta = with pkgs.stdenv.lib; { meta = with pkgs.stdenv.lib; {
description = "A tool to launch OpenGL application on system other than NixOS - Nvidia version"; description = "A tool to launch OpenGL application on system other than NixOS - Nvidia version";
@ -49,7 +50,7 @@ rec {
mkdir -p $out/bin mkdir -p $out/bin
cat > $out/bin/nixGLNvidia << FOO cat > $out/bin/nixGLNvidia << FOO
#!/usr/bin/env sh #!/usr/bin/env sh
export LD_LIBRARY_PATH=${nvidiaLibsOnly}/lib:${libglvnd}/lib export LD_LIBRARY_PATH=${nvidiaLibsOnly}/lib
"\$@" "\$@"
FOO FOO