* The X server doesn't actually depend on HAL anymore.
svn path=/nixos/trunk/; revision=27932
This commit is contained in:
parent
2e4acbcf8b
commit
38fddb2243
|
@ -328,18 +328,13 @@ in
|
||||||
|
|
||||||
###### implementation
|
###### implementation
|
||||||
|
|
||||||
config = mkIf cfg.enable (
|
config = mkIf cfg.enable
|
||||||
mkAssert (config.services.hal.enable == true) "
|
(mkAssert (!(cfg.startOpenSSHAgent && cfg.startGnuPGAgent))
|
||||||
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.
|
The OpenSSH agent and GnuPG agent cannot be started both.
|
||||||
Choose between `startOpenSSHAgent' and `startGnuPGAgent'.
|
Choose between `startOpenSSHAgent' and `startGnuPGAgent'.
|
||||||
" {
|
''
|
||||||
|
{
|
||||||
|
|
||||||
boot.extraModulePackages =
|
boot.extraModulePackages =
|
||||||
optional (elem "nvidia" driverNames) kernelPackages.nvidia_x11 ++
|
optional (elem "nvidia" driverNames) kernelPackages.nvidia_x11 ++
|
||||||
|
@ -381,11 +376,8 @@ in
|
||||||
environment.pathsToLink =
|
environment.pathsToLink =
|
||||||
[ "/etc/xdg" "/share/xdg" "/share/applications" "/share/icons" "/share/pixmaps" ];
|
[ "/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 =
|
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 =
|
environment =
|
||||||
{ FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; # !!! cleanup
|
{ FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; # !!! cleanup
|
||||||
|
@ -534,6 +526,6 @@ in
|
||||||
'')}
|
'')}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
}));
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue