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

Merge pull request #83637 from romildo/desktopManager.desktopNames 

nixos.display-manager: set DesktopNames from a new attribute
This commit is contained in:
worldofpeace 2020-03-29 12:58:08 -04:00 committed by GitHub
parent 22ada10aed e9d707cf8e
commit bedf13071b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/services/x11/desktop-managers/xfce.nix
View File

@ -129,6 +129,7 @@ in
services.xserver.desktopManager.session = [{ services.xserver.desktopManager.session = [{
name = "xfce"; name = "xfce";
desktopNames = [ "XFCE" ];
bgSupport = true; bgSupport = true;
start = '' start = ''
${pkgs.runtimeShell} ${pkgs.xfce.xfce4-session.xinitrc} & ${pkgs.runtimeShell} ${pkgs.xfce.xfce4-session.xinitrc} &

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 ];