Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gnome3.mutter: fix segfault in dri_flush_front_buffer() #67986

Merged
merged 1 commit into from Sep 3, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 8 additions & 1 deletion 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
Expand Down Expand Up @@ -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";
danieldk marked this conversation as resolved.
Show resolved Hide resolved
sha256 = "1hzfva71xdqvvnx5smjsrjlgyrmc7dj94mpylkak0gwda5si0h2n";
})
];

postPatch = ''
Expand Down