about summary refs log tree commit diff
path: root/nixos/modules/hardware
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2017-05-30 20:56:34 +0200
committerVladimír Čunát <vcunat@gmail.com>2017-05-30 20:58:16 +0200
commitbc7b895aa57c52e30eb392ff2527dc850b72c87b (patch)
tree1d0f30bd00c62f695afa96d994143bb04e053e7c /nixos/modules/hardware
parentf8fd5531a3147a8e6229aca98ed9b202dae9eeca (diff)
downloadnixlib-bc7b895aa57c52e30eb392ff2527dc850b72c87b.tar
nixlib-bc7b895aa57c52e30eb392ff2527dc850b72c87b.tar.gz
nixlib-bc7b895aa57c52e30eb392ff2527dc850b72c87b.tar.bz2
nixlib-bc7b895aa57c52e30eb392ff2527dc850b72c87b.tar.lz
nixlib-bc7b895aa57c52e30eb392ff2527dc850b72c87b.tar.xz
nixlib-bc7b895aa57c52e30eb392ff2527dc850b72c87b.tar.zst
nixlib-bc7b895aa57c52e30eb392ff2527dc850b72c87b.zip
nvidia module: allow .persistenced == null
Fixes #26250.  This is fallout from PR #22304.
It's null for 304 and 173 legacy drivers.
Diffstat (limited to 'nixos/modules/hardware')
-rw-r--r--nixos/modules/hardware/video/nvidia.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index 161ed9457af9..f2d71aa34e41 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -56,7 +56,8 @@ in
     hardware.opengl.package = nvidiaPackage nvidia_x11 pkgs;
     hardware.opengl.package32 = nvidiaPackage nvidia_libs32 pkgs_i686;
 
-    environment.systemPackages = [ nvidia_x11.bin nvidia_x11.settings nvidia_x11.persistenced ];
+    environment.systemPackages = [ nvidia_x11.bin nvidia_x11.settings ]
+      ++ lib.filter (p: p != null) [ nvidia_x11.persistenced ];
 
     boot.extraModulePackages = [ nvidia_x11.bin ];