diff options
| author | Bobby Rong <rjl931189261@126.com> | 2024-03-29 22:55:39 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-29 22:55:39 +0800 |
| commit | e96d5c13d06932e0a6fca5d0ec2224ff5f54b852 (patch) | |
| tree | bad932e53393435beff5105a3d396fa1d397c425 /pkgs/desktops/pantheon | |
| parent | 58f6e5b63d670c3882e6d7f44e8523bdf9c47c0e (diff) | |
| parent | bf2ba6e62972d4f7fc1e788747344530089e5ece (diff) | |
Merge pull request #140429 from bobby285271/pantheon-systemd
pantheon: manage user session with systemd
Diffstat (limited to 'pkgs/desktops/pantheon')
| -rw-r--r-- | pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/desktops/pantheon/desktop/gala/default.nix | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index dff4189a1a2de..2588a133ba7bb 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 diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 61d9c120b2461..123870c356de0 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 = { |