nixos/nvidia: check modesetting for gdm-wayland only when gdm is enabled

Reported in NixOS#147153 (comment)
Jauchi · Nov 30, 2021 · dad4fdd · dad4fdd
1 parent 365b448
commit dad4fdd
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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`";
       }