summaryrefslogtreecommitdiffstats
path: root/nixos/modules/services/x11/display-managers
diff options
context:
space:
mode:
authorJosé Romildo Malaquias <malaquias@gmail.com>2020-03-28 10:51:12 -0300
committerJosé Romildo Malaquias <malaquias@gmail.com>2020-03-28 11:13:13 -0300
commitfb47c6fbacedf2ceb3882656127157606b7bbbdf (patch)
treecc59e8036962fe4e1624ac9554dd2090cb4cabae /nixos/modules/services/x11/display-managers
parent11b213656561d70888f4fa0a8707a6952d0bf48c (diff)
nixos.display-managers: use new attribute for desktop names
Diffstat (limited to 'nixos/modules/services/x11/display-managers')
-rw-r--r--nixos/modules/services/x11/display-managers/default.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 5d49ca943872..428ca191fd8f 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -412,6 +412,9 @@ in
(dm: wm: let
sessionName = "${dm.name}${optionalString (wm.name != "none") ("+" + wm.name)}";
script = xsession dm wm;
+ desktopNames = if dm ? desktopNames
+ then concatStringsSep ";" dm.desktopNames
+ else sessionName;
in
optional (dm.name != "none" || wm.name != "none")
(pkgs.writeTextFile {
@@ -427,7 +430,7 @@ in
TryExec=${script}
Exec=${script}
Name=${sessionName}
- DesktopNames=${sessionName}
+ DesktopNames=${desktopNames}
'';
} // {
providedSessions = [ sessionName ];