git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #67986 from danieldk/mutter-resume-fix

gnome3.mutter: fix segfault in dri_flush_front_buffer()

commit72dc15c93dcab5c635d59d6fadac9b214bb74bb6 authorworldofpeace <worldofpeace@protonmail.ch> dateTue 3 Sep 2019, 09:37 (7 years ago) parent8c772a67ddd49a
1 file changed+8−1
pkgs/desktops/gnome-3/core/mutter/default.nix+8−1
pkgs/desktops/gnome-3/core/mutter/default.nix+8−1
@@ -1,4 +1,4 @@
1−{ fetchurl, substituteAll, stdenv, pkgconfig, gnome3, gettext, gobject-introspection, upower, cairo
1+{ fetchurl, fetchpatch, substituteAll, stdenv, pkgconfig, gnome3, gettext, gobject-introspection, upower, cairo
22, pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3
33, ninja, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput
44, gsettings-desktop-schemas, glib, gtk3, gnome-desktop
@@ -55,6 +55,13 @@ stdenv.mkDerivation rec {
5555 src = ./fix-paths.patch;
5656 inherit zenity;
5757 })
58+ # Fix a segmentation fault in dri_flush_front_buffer() upon
59+ # suspend/resume. This change should be removed when Mutter
60+ # is updated to 3.34.
61+ (fetchpatch {
62+ url = "https://gitlab.gnome.org/GNOME/mutter/commit/8307c0f7ab60760de53f764e6636893733543be8.diff";
63+ sha256 = "1hzfva71xdqvvnx5smjsrjlgyrmc7dj94mpylkak0gwda5si0h2n";
64+ })
5865 ];
5966
6067 postPatch = ''