diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 75447adf4a26..0cab4d2e08f5 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pkg-config , meson @@ -26,29 +25,19 @@ stdenv.mkDerivation rec { pname = "gala"; - version = "6.3.0"; + version = "6.3.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-f/WDm9/+lXgplg9tGpct4f+1cOhKgdypwiDRBhewRGw="; + sha256 = "sha256-7RZt6gA3wyp1cxIWBYFK+fYFSZDbjHcwYa2snOmDw1Y="; }; patches = [ + # We look for plugins in `/run/current-system/sw/lib/` because + # there are multiple plugin providers (e.g. gala and wingpanel). ./plugins-dir.patch - # Session crashes when switching windows with Alt+Tab - # https://github.com/elementary/gala/issues/1312 - (fetchpatch { - url = "https://github.com/elementary/gala/commit/cc83db8fe398feae9f3e4caa8352b65f0c8c96d4.patch"; - sha256 = "sha256-CPO3EHIzqHAV6ZLHngivCdsD8je8CK/NHznfxSEkhzc="; - }) - # WindowSwitcher: Clear indicator background - # https://github.com/elementary/gala/pull/1318 - (fetchpatch { - url = "https://github.com/elementary/gala/commit/cce53acffecba795b6cc48916d4621a47996d2c9.patch"; - sha256 = "sha256-5aTZE6poo4sQMTLfk9Nhw4G4BW8i9dvpWktizRIS58Q="; - }) ]; nativeBuildInputs = [