From 7ddd49a86ef2b7f1c8d7ea5d3bec6f3b2926e5cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 3 Sep 2019 08:37:31 +0200 Subject: [PATCH] gnome3.mutter: fix segfault in dri_flush_front_buffer() More details: https://gitlab.gnome.org/GNOME/mutter/commit/56ddaaa3809240a357b5e19b5789d1aa49aaecc3 --- pkgs/desktops/gnome-3/core/mutter/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 61219ca4488..eab0b131ea9 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 = ''