public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/nvidia: Add a temporary hack to support kernel 4.0

Browse Source
This commit is contained in:
William A. Kennington III 2015-04-03 21:53:34 -07:00
parent 18c9619021
commit c0cb4e1ef7
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/hardware/video/nvidia.nix
View File

@ -13,7 +13,10 @@ let
# driver. # driver.
nvidiaForKernel = kernelPackages: nvidiaForKernel = kernelPackages:
if elem "nvidia" drivers then 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 else if elem "nvidiaLegacy173" drivers then
kernelPackages.nvidia_x11_legacy173 kernelPackages.nvidia_x11_legacy173
else if elem "nvidiaLegacy304" drivers then else if elem "nvidiaLegacy304" drivers then

3
pkgs/os-specific/linux/nvidia-x11/default.nix
View File

@ -12,6 +12,9 @@ assert (!libsOnly) -> kernel != null;
let 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"; versionNumber = "346.47";
# Policy: use the highest stable version as the default (on our master). # Policy: use the highest stable version as the default (on our master).