summary refs log tree commit diff
path: root/nixos/modules/hardware/video
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2021-11-30 16:06:21 +0100
committerJan Tojnar <jtojnar@gmail.com>2021-11-30 16:06:21 +0100
commitdad4fddd52923d90c5ad981d5e29963e829de3c1 (patch)
tree95fefb0c98a705308b4a0fede147ea3bf7953435 /nixos/modules/hardware/video
parent365b448d0e97443f5d42c830b3d532db7bb81fb4 (diff)
downloadnixpkgs-dad4fddd52923d90c5ad981d5e29963e829de3c1.tar
nixpkgs-dad4fddd52923d90c5ad981d5e29963e829de3c1.tar.gz
nixpkgs-dad4fddd52923d90c5ad981d5e29963e829de3c1.tar.bz2
nixpkgs-dad4fddd52923d90c5ad981d5e29963e829de3c1.tar.lz
nixpkgs-dad4fddd52923d90c5ad981d5e29963e829de3c1.tar.xz
nixpkgs-dad4fddd52923d90c5ad981d5e29963e829de3c1.tar.zst
nixpkgs-dad4fddd52923d90c5ad981d5e29963e829de3c1.zip
nixos/nvidia: check modesetting for gdm-wayland only when gdm is enabled
Reported in https://github.com/NixOS/nixpkgs/pull/147153#issuecomment-982695772
Diffstat (limited to 'nixos/modules/hardware/video')
-rw-r--r--nixos/modules/hardware/video/nvidia.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index 5b379505608..ff4225dc29a 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -179,7 +179,7 @@ in
   in mkIf enabled {
     assertions = [
       {
-        assertion = with config.services.xserver.displayManager; gdm.nvidiaWayland -> cfg.modesetting.enable;
+        assertion = with config.services.xserver.displayManager; (gdm.enable && gdm.nvidiaWayland) -> cfg.modesetting.enable;
         message = "You cannot use wayland with GDM without modesetting enabled for NVIDIA drivers, set `hardware.nvidia.modesetting.enable = true`";
       }