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

nixos/display-manager: extraSessionFilePackages -> sessionPackages

This commit is contained in:
Tor Hedin Brønner 2019-01-12 08:00:31 +01:00 committed by Jan Tojnar
parent 10c5b2d91c
commit d362df6682
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
6 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/programs/sway.nix
View File

@ -88,7 +88,7 @@ in {
fonts.enableDefaultFonts = mkDefault true;
programs.dconf.enable = mkDefault true;
# To make a Sway session available if a display manager like SDDM is enabled:
services.xserver.displayManager.extraSessionFilePackages = [ swayJoined ];
services.xserver.displayManager.sessionPackages = [ swayJoined ];
};
meta.maintainers = with lib.maintainers; [ gnidorah primeos colemickens ];

2
nixos/modules/services/x11/desktop-managers/default.nix
View File

@ -101,7 +101,7 @@ in
These are the known valid session names:
${concatMapStringsSep "\n " (w: "services.xserver.desktopManager.default = \"${w.name}\";") cfg.session.list}
It's also possible the default can be found in one of these packages:
${concatMapStringsSep "\n " (p: p.name) config.services.xserver.displayManager.extraSessionFilePackages}
${concatMapStringsSep "\n " (p: p.name) config.services.xserver.displayManager.sessionPackages}
'' defaultDM;
};

4
nixos/modules/services/x11/desktop-managers/gnome3.nix
View File

@ -144,7 +144,7 @@ in
services.gnome3.core-shell.enable = true;
services.gnome3.core-utilities.enable = mkDefault true;
services.xserver.displayManager.extraSessionFilePackages = [ pkgs.gnome3.gnome-session ];
services.xserver.displayManager.sessionPackages = [ pkgs.gnome3.gnome-session ];
environment.extraInit = ''
${concatMapStrings (p: ''
@ -171,7 +171,7 @@ in
})
(mkIf flashbackEnabled {
services.xserver.displayManager.extraSessionFilePackages = map
services.xserver.displayManager.sessionPackages = map
(wm: pkgs.gnome3.gnome-flashback.mkSessionForWm {
inherit (wm) wmName wmLabel wmCommand;
}) (optional cfg.flashback.enableMetacity {

2
nixos/modules/services/x11/desktop-managers/pantheon.nix
View File

@ -69,7 +69,7 @@ in
config = mkIf cfg.enable {
services.xserver.displayManager.extraSessionFilePackages = [ pkgs.pantheon.elementary-session-settings ];
services.xserver.displayManager.sessionPackages = [ pkgs.pantheon.elementary-session-settings ];
# Ensure lightdm is used when Pantheon is enabled
# Without it screen locking will be nonfunctional because of the use of lightlocker

2
nixos/modules/services/x11/desktop-managers/surf-display.nix
View File

@ -118,7 +118,7 @@ in {
};
config = mkIf cfg.enable {
services.xserver.displayManager.extraSessionFilePackages = [
services.xserver.displayManager.sessionPackages = [
pkgs.surf-display
];

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

@ -194,14 +194,15 @@ let
if test -d ${pkg}/share/xsessions; then
${xorg.lndir}/bin/lndir ${pkg}/share/xsessions $out/share/xsessions
fi
'') cfg.displayManager.extraSessionFilePackages}
'') cfg.displayManager.sessionPackages}
${concatMapStrings (pkg: ''
if test -d ${pkg}/share/wayland-sessions; then
mkdir -p "$out/share/wayland-sessions"
${xorg.lndir}/bin/lndir ${pkg}/share/wayland-sessions $out/share/wayland-sessions
fi
'') cfg.displayManager.extraSessionFilePackages}
'') cfg.displayManager.sessionPackages}
'';
in
@ -261,11 +262,11 @@ in
'';
};
extraSessionFilePackages = mkOption {
sessionPackages = mkOption {
type = types.listOf types.package;
default = [];
description = ''
A list of packages containing xsession files to be passed to the display manager.
A list of packages containing x11 or wayland session files to be passed to the display manager.
'';
};