diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-15 17:22:30 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-15 17:24:33 +0200 |
| commit | bbe265e8c291d542f5f5a9ea0217e78b4ba6624e (patch) | |
| tree | 8ab6e1080e5987c0f3ef30bc16420e1a11c08e48 /nixos/modules/services/x11/display-managers/lightdm.nix | |
| parent | 0c0bc0857ed459a7e4b6b54fe768828fee9737cd (diff) | |
| download | nixlib-bbe265e8c291d542f5f5a9ea0217e78b4ba6624e.tar nixlib-bbe265e8c291d542f5f5a9ea0217e78b4ba6624e.tar.gz nixlib-bbe265e8c291d542f5f5a9ea0217e78b4ba6624e.tar.bz2 nixlib-bbe265e8c291d542f5f5a9ea0217e78b4ba6624e.tar.lz nixlib-bbe265e8c291d542f5f5a9ea0217e78b4ba6624e.tar.xz nixlib-bbe265e8c291d542f5f5a9ea0217e78b4ba6624e.tar.zst nixlib-bbe265e8c291d542f5f5a9ea0217e78b4ba6624e.zip | |
slim: Only enable if the X server is enabled
http://hydra.nixos.org/build/6494972 Disabling slim revealed that services.xserver.displayManager.job had an incorrect type, so fixed that as well.
Diffstat (limited to 'nixos/modules/services/x11/display-managers/lightdm.nix')
| -rw-r--r-- | nixos/modules/services/x11/display-managers/lightdm.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 266f16e18e30..f4fb5ee003a9 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -89,11 +89,14 @@ in }; config = mkIf cfg.enable { + + services.xserver.displayManager.slim.enable = false; + services.xserver.displayManager.job = { logsXsession = true; # lightdm relaunches itself via just `lightdm`, so needs to be on the PATH - execCmd = '' + execCmd = mkFixStrictness '' export PATH=${lightdm}/sbin:$PATH ${lightdm}/sbin/lightdm --log-dir=/var/log --run-dir=/run --config=${lightdmConf} ''; |