diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-03-17 19:22:22 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-03-17 19:22:22 +0000 |
| commit | ed436179e1e87f985630aafbc6a59a83e611fd28 (patch) | |
| tree | fe9254f0aa3eba6394f55c614035dd2d7c145457 /modules/services/x11/xserver.nix | |
| parent | ee6c9bb998e439c3e9abcfef8cf42e6ef87b28a6 (diff) | |
| download | nixlib-ed436179e1e87f985630aafbc6a59a83e611fd28.tar nixlib-ed436179e1e87f985630aafbc6a59a83e611fd28.tar.gz nixlib-ed436179e1e87f985630aafbc6a59a83e611fd28.tar.bz2 nixlib-ed436179e1e87f985630aafbc6a59a83e611fd28.tar.lz nixlib-ed436179e1e87f985630aafbc6a59a83e611fd28.tar.xz nixlib-ed436179e1e87f985630aafbc6a59a83e611fd28.tar.zst nixlib-ed436179e1e87f985630aafbc6a59a83e611fd28.zip | |
* Improve some job names.
svn path=/nixos/trunk/; revision=33215
Diffstat (limited to 'modules/services/x11/xserver.nix')
| -rw-r--r-- | modules/services/x11/xserver.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix index c918d813e29f..da29faabcfd9 100644 --- a/modules/services/x11/xserver.nix +++ b/modules/services/x11/xserver.nix @@ -384,16 +384,15 @@ in environment.pathsToLink = [ "/etc/xdg" "/share/xdg" "/share/applications" "/share/icons" "/share/pixmaps" ]; - jobs.check_for_xserver_start = + jobs."xserver-start-check" = { startOn = if cfg.autorun then "filesystem and stopped udevtrigger" else ""; stopOn = ""; task = true; - script = "grep -qv noX11 /proc/cmdline && initctl emit start_xserver || true"; + script = "grep -qv noX11 /proc/cmdline && start xserver || true"; }; jobs.xserver = - { startOn = "start_xserver"; - environment = + { environment = { FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; # !!! cleanup XKB_BINDIR = "${xorg.xkbcomp}/bin"; # Needed for the Xkb extension. TZ = config.time.timeZone; |