public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #67986 from danieldk/mutter-resume-fix 

gnome3.mutter: fix segfault in dri_flush_front_buffer()
This commit is contained in:
worldofpeace 2019-09-03 09:37:46 -04:00 committed by GitHub
parent 8c772a6183 7ddd49a86e
commit 72dc15c93d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/desktops/gnome-3/core/mutter/default.nix
View File

@ -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 , pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3
, ninja, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput , ninja, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput
, gsettings-desktop-schemas, glib, gtk3, gnome-desktop , gsettings-desktop-schemas, glib, gtk3, gnome-desktop
@ -55,6 +55,13 @@ stdenv.mkDerivation rec {
src = ./fix-paths.patch; src = ./fix-paths.patch;
inherit zenity; 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 = '' postPatch = ''