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

nixos/displayManager: Install wayland sessions from extraSessionFilePackages

Browse Source
This commit is contained in:
Tor Hedin Brønner
2018-12-09 11:04:42 +01:00
parent 9a37ec0d61
commit 9895ce24b4
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/x11/display-managers/default.nix
+6 -2
View File
@@ -78,8 +78,7 @@ let
# This is required by user units using the session bus. # This is required by user units using the session bus.
${config.systemd.package}/bin/systemctl --user import-environment DISPLAY XAUTHORITY DBUS_SESSION_BUS_ADDRESS ${config.systemd.package}/bin/systemctl --user import-environment DISPLAY XAUTHORITY DBUS_SESSION_BUS_ADDRESS
# Load X defaults. # Load X defaults. This should probably be safe on wayland too.
# FIXME: Check XDG_SESSION_TYPE against x11
${xorg.xrdb}/bin/xrdb -merge ${xresourcesXft} ${xorg.xrdb}/bin/xrdb -merge ${xresourcesXft}
if test -e ~/.Xresources; then if test -e ~/.Xresources; then
${xorg.xrdb}/bin/xrdb -merge ~/.Xresources ${xorg.xrdb}/bin/xrdb -merge ~/.Xresources
@@ -194,6 +193,11 @@ let
${concatMapStrings (pkg: '' ${concatMapStrings (pkg: ''
${xorg.lndir}/bin/lndir ${pkg}/share/xsessions $out/share/xsessions ${xorg.lndir}/bin/lndir ${pkg}/share/xsessions $out/share/xsessions
'') cfg.displayManager.extraSessionFilePackages} '') 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 in