diff options
| author | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2019-01-12 08:00:31 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-15 04:14:56 +0100 |
| commit | d362df6682d3506e17c069f95cb39b10e516d123 (patch) | |
| tree | 47385e3533051e83f7d1d0f2ff599e44e75694ed /nixos/modules/services/x11/display-managers | |
| parent | 10c5b2d91c0683edb89df0f59450f57af0858fda (diff) | |
nixos/display-manager: extraSessionFilePackages -> sessionPackages
Diffstat (limited to 'nixos/modules/services/x11/display-managers')
| -rw-r--r-- | nixos/modules/services/x11/display-managers/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index c252c3c90c94..4a75787f715e 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -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. ''; }; |