public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the OpenSSH/GnuPG agent assertion. 

svn path=/nixos/trunk/; revision=18514
This commit is contained in:
Ludovic Courtès 2009-11-22 00:40:48 +00:00
parent 66d8af6d09
commit 8c349a9e71
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/services/x11/xserver.nix
View File

@ -340,11 +340,14 @@ in
message = "The X server needs HAL running. Set services.hal.enable to true"; message = "The X server needs HAL running. Set services.hal.enable to true";
} }
{ assertion = (cfg.startSSHAgent -> !cfg.startGnuPGAgent) { assertion = if cfg.startSSHAgent
&& (cfg.startGnuPGAgent -> !cfg.startSSHAgent); then !cfg.startGnuPGAgent
else (if cfg.startGnuPGAgent
then !cfg.startSSHAgent
else true);
message = message =
"The OpenSSH SSH agent and GnuPG agent cannot be started " + "The OpenSSH agent and GnuPG agent cannot be started both. "
"both. Choose between `startSSHAgent' and `startGnuPGAgent'."; "Choose between `startSSHAgent' and `startGnuPGAgent'.";
} }
]; ];