www

commit d3d9f07d022f8e818e10321b382d283f8faa8b05
parent 6eed6200ac6156ca92be8539edc021ab754422b0
Author: Guillaume Bouchard <guillaum.bouchard@gmail.com>
Date:   Mon, 26 Feb 2018 16:17:38 +0100

Merge pull request #4 from guibou/noglvnd

Remove glVND dependency. Fix for #3
Diffstat:
M
default.nix
 | 
9
+++++----

1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/default.nix b/default.nix
@@ -18,10 +18,11 @@ rec {
       url = "http://download.nvidia.com/XFree86/Linux-x86_64/${nvidiaVersion}/NVIDIA-Linux-x86_64-${nvidiaVersion}.run";
       sha256 = null;
     };
+    useGLVND = 0;
   });
 
   nixGLNvidiaBumblebee = runCommand "nixGLNvidiaBumblebee-${version}" {
-    buildInputs = [ libglvnd nvidiaLibsOnly bumblebee ];
+    buildInputs = [ nvidiaLibsOnly bumblebee ];
 
      meta = with pkgs.stdenv.lib; {
          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
       #!/usr/bin/env sh
       export LD_LIBRARY_PATH=${nvidiaLibsOnly}/lib
-      ${bumblebee}/bin/optirun --ldpath ${libglvnd}/lib "\$@"
+      ${bumblebee}/bin/optirun "\$@"
       FOO
 
       chmod u+x $out/bin/nixGLNvidiaBumblebee
       '';
 
   nixGLNvidia = runCommand "nixGLNvidia-${version}" {
-    buildInputs = [ libglvnd nvidiaLibsOnly ];
+    buildInputs = [ nvidiaLibsOnly ];
 
      meta = with pkgs.stdenv.lib; {
          description = "A tool to launch OpenGL application on system other than NixOS - Nvidia version";
@@ -49,7 +50,7 @@ rec {
       mkdir -p $out/bin
       cat > $out/bin/nixGLNvidia << FOO
       #!/usr/bin/env sh
-      export LD_LIBRARY_PATH=${nvidiaLibsOnly}/lib:${libglvnd}/lib
+      export LD_LIBRARY_PATH=${nvidiaLibsOnly}/lib
       "\$@"
       FOO