cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #83637 from romildo/desktopManager.desktopNames

Browse source 
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
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 = [{
name = "xfce";
desktopNames = [ "XFCE" ];
bgSupport = true;
start = ''
${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
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 ];