From 1ddb413a6934fc701b3bc26d2c86af6f0c898f26 Mon Sep 17 00:00:00 2001
From: Guillaume Bouchard <guillaum.bouchard@gmail.com>
Date: Mon, 26 Feb 2018 16:07:23 +0100
Subject: [PATCH] Remove glVND dependency. Tentative fix for #3

---
 default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/default.nix b/default.nix
index 4adba09..d666479 100644
--- 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