diff options
| author | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2018-08-04 15:38:01 +0200 |
|---|---|---|
| committer | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2018-12-09 11:04:42 +0100 |
| commit | 9895ce24b454980fbbebe90694d4317ec7ff2233 (patch) | |
| tree | d70379aa7f27da493473948a8091de0b92fa8e87 /nixos | |
| parent | 9a37ec0d615895b86f5785ef0a2162dd653e9206 (diff) | |
| download | nixlib-9895ce24b454980fbbebe90694d4317ec7ff2233.tar nixlib-9895ce24b454980fbbebe90694d4317ec7ff2233.tar.gz nixlib-9895ce24b454980fbbebe90694d4317ec7ff2233.tar.bz2 nixlib-9895ce24b454980fbbebe90694d4317ec7ff2233.tar.lz nixlib-9895ce24b454980fbbebe90694d4317ec7ff2233.tar.xz nixlib-9895ce24b454980fbbebe90694d4317ec7ff2233.tar.zst nixlib-9895ce24b454980fbbebe90694d4317ec7ff2233.zip | |
nixos/displayManager: Install wayland sessions from extraSessionFilePackages
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/x11/display-managers/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 26b79730dd38..cb3c0c7a8437 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -78,8 +78,7 @@ let # This is required by user units using the session bus. ${config.systemd.package}/bin/systemctl --user import-environment DISPLAY XAUTHORITY DBUS_SESSION_BUS_ADDRESS - # Load X defaults. - # FIXME: Check XDG_SESSION_TYPE against x11 + # Load X defaults. This should probably be safe on wayland too. ${xorg.xrdb}/bin/xrdb -merge ${xresourcesXft} if test -e ~/.Xresources; then ${xorg.xrdb}/bin/xrdb -merge ~/.Xresources @@ -194,6 +193,11 @@ let ${concatMapStrings (pkg: '' ${xorg.lndir}/bin/lndir ${pkg}/share/xsessions $out/share/xsessions '') cfg.displayManager.extraSessionFilePackages} + + mkdir -p "$out/share/wayland-sessions" + ${concatMapStrings (pkg: '' + ${xorg.lndir}/bin/lndir ${pkg}/share/wayland-sessions $out/share/wayland-sessions + '') cfg.displayManager.extraSessionFilePackages} ''; in |