summary refs log tree commit diff
path: root/pkgs/desktops/pantheon
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2023-03-24 12:19:17 +0800
committerBobby Rong <rjl931189261@126.com>2023-03-24 12:29:20 +0800
commit19a8c53c10e0cbd54b22ed353bfeacbd90fb240c (patch)
tree3a6c5ccef9c8de85629ed80ff12eab2c5cee21a9 /pkgs/desktops/pantheon
parent19cf008bb18e47b6e3b4e16e32a9a4bdd4b45f7e (diff)
downloadnixpkgs-19a8c53c10e0cbd54b22ed353bfeacbd90fb240c.tar
nixpkgs-19a8c53c10e0cbd54b22ed353bfeacbd90fb240c.tar.gz
nixpkgs-19a8c53c10e0cbd54b22ed353bfeacbd90fb240c.tar.bz2
nixpkgs-19a8c53c10e0cbd54b22ed353bfeacbd90fb240c.tar.lz
nixpkgs-19a8c53c10e0cbd54b22ed353bfeacbd90fb240c.tar.xz
nixpkgs-19a8c53c10e0cbd54b22ed353bfeacbd90fb240c.tar.zst
nixpkgs-19a8c53c10e0cbd54b22ed353bfeacbd90fb240c.zip
pantheon.gala: Backport various upstream fixes
Diffstat (limited to 'pkgs/desktops/pantheon')
-rw-r--r--pkgs/desktops/pantheon/desktop/gala/default.nix22
1 files changed, 22 insertions, 0 deletions
diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix
index 89e035d8690..32f2a17be27 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
@@ -38,6 +39,27 @@ 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
+
+    # WindowClone: Don't calculate offset
+    # https://github.com/elementary/gala/pull/1567
+    (fetchpatch {
+      url = "https://github.com/elementary/gala/commit/b7139add2333e5419afd1c82c3790d85044c1f76.patch";
+      sha256 = "sha256-QhBARbA3YEXB/RIM/gmFiry1IzGvFFQVXGDs0kGjf20=";
+    })
+
+    # Map notification windows manually while switching workspace
+    # https://github.com/elementary/gala/pull/1577
+    (fetchpatch {
+      url = "https://github.com/elementary/gala/commit/97b33173e2ee8b4a4af3fe0513b6d264de9d9b2a.patch";
+      sha256 = "sha256-y2PicvHxtKlZTpr6a0Hua1ppXpRwDItsIoGG2r+DAjQ=";
+    })
+
+    # Use ClickAction for FramedBackground and close buttons
+    # https://github.com/elementary/gala/pull/1579
+    (fetchpatch {
+      url = "https://github.com/elementary/gala/commit/79453b324d2e737ba32124212632e1269c6c9af1.patch";
+      sha256 = "sha256-ipOoY3dn0Hs1U2d9OER+ZfgC5AL4yay4FD8ongID/xY=";
+    })
   ];
 
   nativeBuildInputs = [