colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos.display-managers: use new attribute for desktop names

Browse Source
This commit is contained in:
José Romildo Malaquias 2020-03-28 10:51:12 -03:00
parent 11b2136565
commit fb47c6fbac
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/services/x11/display-managers/default.nix
View File

@ -412,6 +412,9 @@ in
(dm: wm: let (dm: wm: let
sessionName = "${dm.name}${optionalString (wm.name != "none") ("+" + wm.name)}"; sessionName = "${dm.name}${optionalString (wm.name != "none") ("+" + wm.name)}";
script = xsession dm wm; script = xsession dm wm;
desktopNames = if dm ? desktopNames
then concatStringsSep ";" dm.desktopNames
else sessionName;
in in
optional (dm.name != "none" || wm.name != "none") optional (dm.name != "none" || wm.name != "none")
(pkgs.writeTextFile { (pkgs.writeTextFile {
@ -427,7 +430,7 @@ in
TryExec=${script} TryExec=${script}
Exec=${script} Exec=${script}
Name=${sessionName} Name=${sessionName}
DesktopNames=${sessionName} DesktopNames=${desktopNames}
''; '';
} // { } // {
providedSessions = [ sessionName ]; providedSessions = [ sessionName ];