diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2015-10-18 01:53:13 +0300 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-28 10:17:12 +0100 |
| commit | db81e221487e8f97018b15c20270044c24c6e918 (patch) | |
| tree | 47b2a3fdc968f5bd5c8fa92437d3f6e07952dec3 /nixos/modules/services/x11/display-managers | |
| parent | bff9b546e4722923e86afc99ccacace31f70ee77 (diff) | |
| download | nixlib-db81e221487e8f97018b15c20270044c24c6e918.tar nixlib-db81e221487e8f97018b15c20270044c24c6e918.tar.gz nixlib-db81e221487e8f97018b15c20270044c24c6e918.tar.bz2 nixlib-db81e221487e8f97018b15c20270044c24c6e918.tar.lz nixlib-db81e221487e8f97018b15c20270044c24c6e918.tar.xz nixlib-db81e221487e8f97018b15c20270044c24c6e918.tar.zst nixlib-db81e221487e8f97018b15c20270044c24c6e918.zip | |
treewide: Mass-replace 'xorgserver}/bin' with correct output
vcunat added one fix in xdummy.
Diffstat (limited to 'nixos/modules/services/x11/display-managers')
| -rw-r--r-- | nixos/modules/services/x11/display-managers/default.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/x11/display-managers/sddm.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index c59777f525d1..4f6d490bd91d 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -322,7 +322,7 @@ in config = { - services.xserver.displayManager.xserverBin = "${xorg.xorgserver}/bin/X"; + services.xserver.displayManager.xserverBin = "${xorg.xorgserver.out}/bin/X"; }; diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index c44383cc6117..3f1d190ae66b 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -31,7 +31,7 @@ let [XDisplay] MinimumVT=${toString xcfg.tty} ServerPath=${xserverWrapper} - XephyrPath=${pkgs.xorg.xorgserver}/bin/Xephyr + XephyrPath=${pkgs.xorg.xorgserver.out}/bin/Xephyr SessionCommand=${dmcfg.session.script} SessionDir=${dmcfg.session.desktops} XauthPath=${pkgs.xorg.xauth}/bin/xauth |