movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-16 06:29:17 +03:00
Code Issues Projects Releases Packages Wiki Activity

* Synced with trunk @ 15369

Browse source 
also adding missing assertion fixed in 15609

svn path=/nixos/branches/modular-nixos/; revision=15610
This commit is contained in:
Marc Weber 2009-05-15 07:51:51 +00:00
parent ecff4f580c
commit 1e16e6dee4
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
upstart-jobs/xserver/default.nix
View file

@ -465,6 +465,9 @@ let
in in
mkIf cfg.enable { mkIf cfg.enable {
assertions = [ { assertion = config.services.hal.enable == true; message = "The X server needs HAL running. Set services.hal.enable to true"; } ];
require = [ require = [
options options
@ -530,7 +533,7 @@ mkIf cfg.enable {
extraJobs = [{ extraJobs = [{
name = "xserver"; name = "xserver";
job = '' job = ''
start on ${if cfg.autorun then "network-interfaces" else "never"} start on ${if cfg.autorun then "hal" else "never"}
start script start script