From 8291ea61b0db91de2649d53a79f3e826de789434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 7 Mar 2016 23:25:59 +0100 Subject: [PATCH] nvidia: allow using the beta driver, mainly in future --- nixos/modules/hardware/video/nvidia.nix | 2 ++ pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 711576982ec..8514f765e61 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -14,6 +14,8 @@ let nvidiaForKernel = kernelPackages: if elem "nvidia" drivers then kernelPackages.nvidia_x11 + else if elem "nvidiaBeta" drivers then + kernelPackages.nvidia_x11_beta else if elem "nvidiaLegacy173" drivers then kernelPackages.nvidia_x11_legacy173 else if elem "nvidiaLegacy304" drivers then diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15b3c1266be..9b5aad0fe1e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10515,7 +10515,8 @@ let nvidia_x11_legacy173 = callPackage ../os-specific/linux/nvidia-x11/legacy173.nix { }; nvidia_x11_legacy304 = callPackage ../os-specific/linux/nvidia-x11/legacy304.nix { }; nvidia_x11_legacy340 = callPackage ../os-specific/linux/nvidia-x11/legacy340.nix { }; - nvidia_x11_beta = callPackage ../os-specific/linux/nvidia-x11/beta.nix { }; + nvidia_x11_beta = nvidia_x11; # latest beta is lower version ATM + # callPackage ../os-specific/linux/nvidia-x11/beta.nix { }; nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { }; rtl8812au = callPackage ../os-specific/linux/rtl8812au { };