Fix the OpenSSH/GnuPG agent assertion.

svn path=/nixos/trunk/; revision=18514

1 files changed, 7 insertions, 4 deletions

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index ee6f7c50f122..62fb26f829e9 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -340,11 +340,14 @@ in
           message = "The X server needs HAL running. Set services.hal.enable to true";
         }
 
-        { assertion = (cfg.startSSHAgent -> !cfg.startGnuPGAgent)
-                       && (cfg.startGnuPGAgent -> !cfg.startSSHAgent);
+        { assertion = if cfg.startSSHAgent
+                      then !cfg.startGnuPGAgent
+                      else (if cfg.startGnuPGAgent
+                            then !cfg.startSSHAgent
+                            else true);
           message =
-            "The OpenSSH SSH agent and GnuPG agent cannot be started " +
-            "both.  Choose between `startSSHAgent' and `startGnuPGAgent'.";
+            "The OpenSSH agent and GnuPG agent cannot be started both.  "
+            "Choose between `startSSHAgent' and `startGnuPGAgent'.";
         }
       ];