From bd3f680d370e43986224bf2b83047238f2bbd039 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 5 Apr 2024 21:23:11 +0800 Subject: pantheon.gala: Backport Wayland menu commit gala-daemon actually needs a correct environment for `AppInfo.launch_default_for_uri`. --- pkgs/desktops/pantheon/desktop/gala/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'pkgs/desktops/pantheon') diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 123870c356de0..3cf8a67e9539b 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pkg-config , meson @@ -39,6 +40,13 @@ stdenv.mkDerivation rec { # We look for plugins in `/run/current-system/sw/lib/` because # there are multiple plugin providers (e.g. gala and wingpanel). ./plugins-dir.patch + + # Start gala-daemon internally (needed for systemd managed gnome-session) + # https://github.com/elementary/gala/pull/1844 + (fetchpatch { + url = "https://github.com/elementary/gala/commit/351722c5a4fded46992b725e03dc94971c5bd31f.patch"; + hash = "sha256-RvdVHQjCUNmLrROBZTF+m1vE2XudtQZjk/YW28P/vKc="; + }) ]; nativeBuildInputs = [ @@ -70,9 +78,6 @@ 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 1.4.1