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

* The X server doesn't actually depend on HAL anymore. 

svn path=/nixos/trunk/; revision=27932
This commit is contained in:
Eelco Dolstra 2011-07-25 00:50:46 +00:00
parent 2e4acbcf8b
commit 38fddb2243
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -328,18 +328,13 @@ in
###### implementation
config = mkIf cfg.enable (
mkAssert (config.services.hal.enable == true) "
The X server needs HAL running. Set services.hal.enable to true
" (
mkAssert (if cfg.startOpenSSHAgent
then !cfg.startGnuPGAgent
else (if cfg.startGnuPGAgent
then !cfg.startOpenSSHAgent
else true)) "
The OpenSSH agent and GnuPG agent cannot be started both.
Choose between `startOpenSSHAgent' and `startGnuPGAgent'.
" {
config = mkIf cfg.enable
(mkAssert (!(cfg.startOpenSSHAgent && cfg.startGnuPGAgent))
''
The OpenSSH agent and GnuPG agent cannot be started both.
Choose between `startOpenSSHAgent' and `startGnuPGAgent'.
''
{
boot.extraModulePackages =
optional (elem "nvidia" driverNames) kernelPackages.nvidia_x11 ++
@ -381,11 +376,8 @@ in
environment.pathsToLink =
[ "/etc/xdg" "/share/xdg" "/share/applications" "/share/icons" "/share/pixmaps" ];
services.hal.enable = mkAlways cfg.enable;
services.hal.packages = optional (elem "virtualbox" driverNames) kernelPackages.virtualboxGuestAdditions;
jobs.xserver =
{ startOn = if cfg.autorun then "filesystem and stopped udevtrigger and started hal" else "";
{ startOn = if cfg.autorun then "filesystem and stopped udevtrigger" else "";
environment =
{ FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; # !!! cleanup
@ -534,6 +526,6 @@ in
'')}
'';
}));
});
}