about summary refs log tree commit diff
path: root/pkgs/desktops/gnome-3
diff options
context:
space:
mode:
authorTor Hedin Brønner <torhedinbronner@gmail.com>2019-09-28 14:01:27 +0200
committerJan Tojnar <jtojnar@gmail.com>2019-10-03 00:09:18 +0200
commit880fab10fc8fb882d98c6087e28caad49eb64314 (patch)
tree84888b3f188488e222d1b9d6651b021f921dba25 /pkgs/desktops/gnome-3
parent34a76d40cd9ea624bdfc7df4b06d39545bd85c69 (diff)
downloadnixlib-880fab10fc8fb882d98c6087e28caad49eb64314.tar
nixlib-880fab10fc8fb882d98c6087e28caad49eb64314.tar.gz
nixlib-880fab10fc8fb882d98c6087e28caad49eb64314.tar.bz2
nixlib-880fab10fc8fb882d98c6087e28caad49eb64314.tar.lz
nixlib-880fab10fc8fb882d98c6087e28caad49eb64314.tar.xz
nixlib-880fab10fc8fb882d98c6087e28caad49eb64314.tar.zst
nixlib-880fab10fc8fb882d98c6087e28caad49eb64314.zip
gnome3.mutter: Add upstream patches before 3.34.1
Fixes some eg. animation related crashes which in particular affected
dash-to-dock.
Diffstat (limited to 'pkgs/desktops/gnome-3')
-rw-r--r--pkgs/desktops/gnome-3/core/mutter/default.nix27
1 files changed, 27 insertions, 0 deletions
diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index 6c4d7a97ba24..ce129f7537f6 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -59,6 +59,33 @@ stdenv.mkDerivation rec {
       url = "https://gitlab.gnome.org/GNOME/mutter/commit/850ef518795dcc20d3b9a4f661f70ff8d0ddacb2.patch";
       sha256 = "0cxdbrbcc8kfkvw7ryxjm2v1vk15jki7bawn128385r5hasabhxf";
     })
+    # fix animation related crashes: https://gitlab.gnome.org/GNOME/mutter/merge_requests/805
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/mutter/commit/63a0b702c94af013b94ad3f32a8c5ba86bf6dfba.patch";
+      sha256 = "13hvz3n275crvpankj1b47nds71c42nnbq1yx2xhhvk60qc72vh4";
+    })
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/mutter/commit/1e637bd7e1b2a4316d1cf6da80966d43819a10df.patch";
+      sha256 = "0jcx33j2sw7hva0gs0svqg69habxxmgdi0kcb07nqq2df6pb62qf";
+    })
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/mutter/commit/c9c53cb55fd6e782c50f36da1e2adbf28111a660.patch";
+      sha256 = "0iwjlbr8j0icigmilpghlkcyg4hll9dm0mcaj8lvi7qxrgjrmczr";
+    })
+    # Fix crash when pressing ctrl-super: https://gitlab.gnome.org/GNOME/mutter/issues/823
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/mutter/commit/0706e021f5bd82cf4c9b2c0d2916d272f3cba406.patch";
+      sha256 = "0i4ixr419jggrd17gxxs45jnx131lnp8wkkhhygqsrpq8941sdw6";
+    })
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/mutter/commit/76f2579e442d8ad0a3b8b644daab7c72a585506b.patch";
+      sha256 = "0c3ls624k9f4mqrrbv8ng0slvm31l0li6ciqn04qd4yi18plnldy";
+    })
+    # Avoid crashing any apps on X11 when restarting: https://gitlab.gnome.org/GNOME/mutter/merge_requests/808
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/mutter/commit/f352c3d79da99e961341c1d2b5dd334dcade0271.patch";
+      sha256 = "1drn8wjbkj903jxay5wxq163i9ahp558sjl2bc3fi1qs90xj6cn2";
+    })
    # TODO: submit upstream
    ./0001-build-use-get_pkgconfig_variable-for-sysprof-dbusdir.patch
     (substituteAll {