From c0cb4e1ef7a41a5e07192f1dd30fae49d45e55e1 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 3 Apr 2015 21:53:34 -0700 Subject: [PATCH] nixos/nvidia: Add a temporary hack to support kernel 4.0 --- nixos/modules/hardware/video/nvidia.nix | 5 ++++- pkgs/os-specific/linux/nvidia-x11/default.nix | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 209310bec99..2ea0cd69384 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 diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 02731d7f775..f34e593b961 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -12,6 +12,9 @@ assert (!libsOnly) -> kernel != null; let + # TODO: Remove the use of the beta driver for kernel 4.0 in + # nixos/modules/hardware/video/nvidia.nix when this driver supports + # kernel 4.0 versionNumber = "346.47"; # Policy: use the highest stable version as the default (on our master).