nvidia: make sure useGLVND is always disabled; fix #6 and #7

deepfire · May 17, 2017 · 475c373 · 475c373
1 parent c3a2be1
commit 475c373
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/README.org b/README.org
@@ -19,7 +19,9 @@
     |              | nVidia/nvidia | nVidia/nouveau | AMD/AMDGPU-PRO | AMD/radeonsi | Intel |
     |--------------+---------------+----------------+----------------+--------------+-------|
     | SteamOS      | ✅            |                |                |              |       |
-    | Ubuntu 16.04 | [[https://github.com/deepfire/nix-install-vendor-gl/issues/6][#6]], [[https://github.com/deepfire/nix-install-vendor-gl/issues/7][#7]]        |                |                |              |       |
+    | Ubuntu 16.04 | ✅            |                |                |              |       |
+    | Ubuntu 16.10 | [[https://github.com/deepfire/nix-install-vendor-gl/issues/7][#7]]            |                |                |              |       |
+    | Ubuntu 17.04 |               |                |                |              |       |
 
 * Quickstart
 *** Prerequisites

diff --git a/nix-install-vendor-gl.sh b/nix-install-vendor-gl.sh
@@ -469,10 +469,12 @@ EOF
                         info "Both the host system and Nix provide matching vendor GL driver versions."
 		        cat >${tmpnix} <<EOF
 with import <nixpkgs> { config = { allowUnfree = true; }; };
-let vendorgl = ${vendorgl_attribute}.override {
+let vendorgl = (${vendorgl_attribute}.override {
       libsOnly = true;
       kernel   = null;
-    };
+    }).overrideAttrs (oldAttrs: rec {
+      useGLVND = 0;
+    });
 in buildEnv { name = "opengl-drivers"; paths = [ vendorgl ]; }
 EOF
 	        fi