summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorLuke Granger-Brown <git@lukegb.com>2021-08-01 22:22:35 +0000
committerLuke Granger-Brown <git@lukegb.com>2021-08-01 22:22:35 +0000
commit5a7d7dc19f774e66f83c7e214007107c7d89da2d (patch)
tree2c41eb283005e4279b7e04574d063fd16683b564 /nixos
parent151c2f5a20c8d03a168242af18225f46786ef7c1 (diff)
downloadnixpkgs-5a7d7dc19f774e66f83c7e214007107c7d89da2d.tar
nixpkgs-5a7d7dc19f774e66f83c7e214007107c7d89da2d.tar.gz
nixpkgs-5a7d7dc19f774e66f83c7e214007107c7d89da2d.tar.bz2
nixpkgs-5a7d7dc19f774e66f83c7e214007107c7d89da2d.tar.lz
nixpkgs-5a7d7dc19f774e66f83c7e214007107c7d89da2d.tar.xz
nixpkgs-5a7d7dc19f774e66f83c7e214007107c7d89da2d.tar.zst
nixpkgs-5a7d7dc19f774e66f83c7e214007107c7d89da2d.zip
nixos/display-managers: update set-session for new "SessionType" property
GDM 40.1 switched from storing X11 sessions in the "XSession" property
on AccountService to "Session" with a "x11" "SessionType".

For compatibility reasons, we should set both, since AccountService
doesn't seem to provide the compatibility for us.
Diffstat (limited to 'nixos')
-rwxr-xr-xnixos/modules/services/x11/display-managers/set-session.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/nixos/modules/services/x11/display-managers/set-session.py b/nixos/modules/services/x11/display-managers/set-session.py
index 0cca80af44e..75940efe32b 100755
--- a/nixos/modules/services/x11/display-managers/set-session.py
+++ b/nixos/modules/services/x11/display-managers/set-session.py
@@ -72,11 +72,14 @@ def main():
                     f"Setting session name: {session}, as we found the existing wayland-session: {session_file}"
                 )
                 user.set_session(session)
+                user.set_session_type("wayland")
             elif is_session_xsession(session_file):
                 logging.debug(
                     f"Setting session name: {session}, as we found the existing xsession: {session_file}"
                 )
                 user.set_x_session(session)
+                user.set_session(session)
+                user.set_session_type("x11")
             else:
                 logging.error(f"Couldn't figure out session type for {session_file}")
                 sys.exit(1)