about summary refs log tree commit diff
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2016-01-01 18:31:42 +0100
committeraszlig <aszlig@redmoonstudios.org>2016-01-01 18:41:20 +0100
commit010daf75902c3dc9ea449cfc202fb8004e3d45e1 (patch)
treea12a9825bf50c26bdc5ca456468a6ef9a77fb326
parent84deaf7531d4638e765d10e980c6ac5eb4d5fc0b (diff)
machines/haenk: Override Mesa using LLVM 3.6
Since NixOS/nixpkgs@3e96b76, LLVM 3.7 is the default for all packages,
including Mesa. Unfortunately, the NV44M GPU drivers do not seem to like
this very much.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
-rw-r--r--machines/aszlig/managed/haenk.nix10
1 files changed, 9 insertions, 1 deletions
diff --git a/machines/aszlig/managed/haenk.nix b/machines/aszlig/managed/haenk.nix
index e56329e7..a2764cbe 100644
--- a/machines/aszlig/managed/haenk.nix
+++ b/machines/aszlig/managed/haenk.nix
@@ -53,7 +53,15 @@
     auto-optimise-store = true
   '';
 
-  nixpkgs.config.allowUnfree = true;
+  nixpkgs.config = {
+    packageOverrides = opkgs: {
+      # This is because the driver for the NV44M GPU doesn't like LLVM 3.7
+      mesa_noglu = pkgs.mesa_noglu.override {
+        llvmPackages = pkgs.llvmPackages_36;
+      };
+    };
+    allowUnfree = true;
+  };
 
   services.openssh.enable = true;
   services.tlp.enable = true;