summary refs log tree commit diff
path: root/nixos/modules/hardware
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-04-03 21:53:34 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-04-03 21:53:34 -0700
commitc0cb4e1ef7a41a5e07192f1dd30fae49d45e55e1 (patch)
tree0ea415b68b139f06fef82fe3d54144c23de6611b /nixos/modules/hardware
parent18c9619021dc6578fb00f8785d46022ba5ee553f (diff)
downloadnixlib-c0cb4e1ef7a41a5e07192f1dd30fae49d45e55e1.tar
nixlib-c0cb4e1ef7a41a5e07192f1dd30fae49d45e55e1.tar.gz
nixlib-c0cb4e1ef7a41a5e07192f1dd30fae49d45e55e1.tar.bz2
nixlib-c0cb4e1ef7a41a5e07192f1dd30fae49d45e55e1.tar.lz
nixlib-c0cb4e1ef7a41a5e07192f1dd30fae49d45e55e1.tar.xz
nixlib-c0cb4e1ef7a41a5e07192f1dd30fae49d45e55e1.tar.zst
nixlib-c0cb4e1ef7a41a5e07192f1dd30fae49d45e55e1.zip
nixos/nvidia: Add a temporary hack to support kernel 4.0
Diffstat (limited to 'nixos/modules/hardware')
-rw-r--r--nixos/modules/hardware/video/nvidia.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index 209310bec999..2ea0cd69384b 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -13,7 +13,10 @@ let
   # driver.
   nvidiaForKernel = kernelPackages:
     if elem "nvidia" drivers then
-      kernelPackages.nvidia_x11
+      if versionAtLeast kernelPackages.kernel.version "4.0" then
+        kernelPackages.nvidia_x11_beta
+      else
+        kernelPackages.nvidia_x11
     else if elem "nvidiaLegacy173" drivers then
       kernelPackages.nvidia_x11_legacy173
     else if elem "nvidiaLegacy304" drivers then