From 9695efdfbad74c7eb18d35cd965b82cc6158e226 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 22 Dec 2022 09:42:59 +0800 Subject: [PATCH] pantheon.gala: Backport various upstream fixes --- .../pantheon/desktop/gala/default.nix | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 6c7713098822..d182a4d9c36d 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -60,6 +60,49 @@ stdenv.mkDerivation rec { url = "https://github.com/elementary/gala/commit/23c7edeb0ee9b0ff0aa48c1d19fbd1739df7af78.patch"; sha256 = "sha256-OfIDBfVEZoY8vMu9F8gtfRg4TYA1MUAG94BSOBKVGcI="; }) + + # Work around crash when receiving notifications + # https://github.com/elementary/gala/pull/1497 + (fetchpatch { + url = "https://github.com/elementary/gala/commit/8842e576e3e8643a018d506605f80d152e3f5cec.patch"; + sha256 = "sha256-xu9Rh7TH0ccRU1TInTNTm+dDaCXj5aaEwDw3rBW02q8="; + }) + + # ShadowEffect: let Clutter know the shadow's size + # https://github.com/elementary/gala/pull/1500 + (fetchpatch { + url = "https://github.com/elementary/gala/commit/34a208e26d2ee0bf4a1689c8ad6ddfc06c540ff8.patch"; + sha256 = "sha256-KPIXNWTlKGc3JImt82t5lmcMu0bqrPx1JNv+TbsxhOg="; + }) + + # Fix awkward two-finger scroll in multitasking view + # https://github.com/elementary/gala/pull/1499 + (fetchpatch { + url = "https://github.com/elementary/gala/commit/c175d2662dd05e940a5b3311cc9dc285242b7fc5.patch"; + sha256 = "sha256-xsxYDagPmaNSZO/Cj7NjPqBHCc1hrqvpboAvPIg9P58="; + }) + + # Fix crash when monitor is turned off + # https://github.com/elementary/gala/pull/1491 + (fetchpatch { + url = "https://github.com/elementary/gala/commit/1487660812a343e6a6178881e6e7b25c2405cece.patch"; + sha256 = "sha256-YsRaWmDSg0h0RFTUOoMxlNcKoA4MNa8AhW1GGmk8qLA="; + }) + + # Fix quick zooming (next 3 patches) + # https://github.com/elementary/gala/pull/1501 + (fetchpatch { + url = "https://github.com/elementary/gala/commit/b9c5c9c79a045c3eef7695f74f82d851438ba7e2.patch"; + sha256 = "sha256-PGjf/B/7UQxpW0Pby7ZXuMoDlamZwEaDvaN9PaRulHU="; + }) + (fetchpatch { + url = "https://github.com/elementary/gala/commit/49d3ddae5b631027466ff528c2935e05a8f5dc3f.patch"; + sha256 = "sha256-hvm2GcqiMYYxOLpQFXdyz325jZme7W+VYipu5goKoiU="; + }) + (fetchpatch { + url = "https://github.com/elementary/gala/commit/45126e4c2d3736e872c05941a2047a54788cd011.patch"; + sha256 = "sha256-LdhFFFNwvF1p1LqJXer8+DOgAptiHZHlfnQBwVEIZjo="; + }) ]; nativeBuildInputs = [