From d912b510f50d63344db64f7becaf74d15cf2171a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 22 Nov 2009 00:46:37 +0000
Subject: [PATCH] Hopefully really fix the OpenSSH/GnuPG agent assertion.

svn path=/nixos/trunk/; revision=18516
---
 modules/services/x11/xserver.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 1ea26c5af0a..baf224975a2 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -342,9 +342,9 @@ in
 
         { assertion = if cfg.startOpenSSHAgent
                       then !cfg.startGnuPGAgent
-                      else (if cfg.startGnuPGAgent
-                            then !cfg.startOpenSSHAgent
-                            else true);
+                      else if cfg.startGnuPGAgent
+                           then !cfg.startOpenSSHAgent
+                           else true;
           message =
             "The OpenSSH agent and GnuPG agent cannot be started both.  "
             "Choose between `startOpenSSHAgent' and `startGnuPGAgent'.";