From 7522f97cbef26c7ca6b15615ad2144730232dbe4 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 9 Jul 2023 17:35:28 +0800 Subject: pantheon: Manage user session with systemd This is now needed as gnome-session 46 drops `--builtin` option. --- pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/desktops/pantheon') diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index d1d2b6533e93..3f9489231474 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -72,7 +72,7 @@ let export XDG_DATA_DIRS=@out@/share:$XDG_DATA_DIRS # Start pantheon session. Keep in sync with upstream - exec ${gnome-session}/bin/gnome-session --builtin --session=pantheon "$@" + exec ${gnome-session}/bin/gnome-session --session=pantheon "$@" ''; # Absolute path patched version of the upstream xsession -- cgit v1.2.3 From a4bca9aaef02c625ffcb2c11322d7a87192ac33b Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 27 Jan 2024 16:20:15 +0800 Subject: nixos/pantheon: Add missing gala-daemon systemd services Otherwise it doesn't autostart after user session managed by systemd. --- pkgs/desktops/pantheon/desktop/gala/default.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'pkgs/desktops/pantheon') diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 61d9c120b246..123870c356de 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -70,6 +70,9 @@ stdenv.mkDerivation rec { postPatch = '' chmod +x build-aux/meson/post_install.py patchShebangs build-aux/meson/post_install.py + + # https://github.com/elementary/gala/issues/1826#issuecomment-1890461298 + sed '2i Wants=io.elementary.gala.daemon@.service' -i 'data/gala@x11.service.in' ''; passthru = { -- cgit v1.2.3