about summary refs log tree commit diff
path: root/pkgs/desktops/gnome-3
diff options
context:
space:
mode:
authorDaniël de Kok <me@danieldk.eu>2019-09-03 08:37:31 +0200
committerDaniël de Kok <me@danieldk.eu>2019-09-03 15:20:38 +0200
commit7ddd49a86ef2b7f1c8d7ea5d3bec6f3b2926e5cf (patch)
tree8084d2531372051b1487cddaf918b147ec6f1871 /pkgs/desktops/gnome-3
parent2d708d3524d23e814ddcdfe7b226beb151281e8c (diff)
downloadnixlib-7ddd49a86ef2b7f1c8d7ea5d3bec6f3b2926e5cf.tar
nixlib-7ddd49a86ef2b7f1c8d7ea5d3bec6f3b2926e5cf.tar.gz
nixlib-7ddd49a86ef2b7f1c8d7ea5d3bec6f3b2926e5cf.tar.bz2
nixlib-7ddd49a86ef2b7f1c8d7ea5d3bec6f3b2926e5cf.tar.lz
nixlib-7ddd49a86ef2b7f1c8d7ea5d3bec6f3b2926e5cf.tar.xz
nixlib-7ddd49a86ef2b7f1c8d7ea5d3bec6f3b2926e5cf.tar.zst
nixlib-7ddd49a86ef2b7f1c8d7ea5d3bec6f3b2926e5cf.zip
gnome3.mutter: fix segfault in dri_flush_front_buffer()
More details:

https://gitlab.gnome.org/GNOME/mutter/commit/56ddaaa3809240a357b5e19b5789d1aa49aaecc3
Diffstat (limited to 'pkgs/desktops/gnome-3')
-rw-r--r--pkgs/desktops/gnome-3/core/mutter/default.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index 61219ca4488e..eab0b131ea93 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, substituteAll, stdenv, pkgconfig, gnome3, gettext, gobject-introspection, upower, cairo
+{ fetchurl, fetchpatch, substituteAll, stdenv, pkgconfig, gnome3, gettext, gobject-introspection, upower, cairo
 , pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3
 , ninja, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput
 , gsettings-desktop-schemas, glib, gtk3, gnome-desktop
@@ -55,6 +55,13 @@ stdenv.mkDerivation rec {
       src = ./fix-paths.patch;
       inherit zenity;
     })
+    # Fix a segmentation fault in dri_flush_front_buffer() upon
+    # suspend/resume. This change should be removed when Mutter
+    # is updated to 3.34.
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/mutter/commit/8307c0f7ab60760de53f764e6636893733543be8.diff";
+      sha256 = "1hzfva71xdqvvnx5smjsrjlgyrmc7dj94mpylkak0gwda5si0h2n";
+    })
   ];
 
   postPatch = ''