diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-09-03 09:37:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-03 09:37:46 -0400 |
| commit | 72dc15c93dcab5c635d59d6fadac9b214bb74bb6 (patch) | |
| tree | 8f80fd9b1f1b030c8da763f124d5de4c8f7bbdac /pkgs/desktops/gnome-3 | |
| parent | 8c772a6183560bb8ad77f2d0715885456e17b9e5 (diff) | |
| parent | 7ddd49a86ef2b7f1c8d7ea5d3bec6f3b2926e5cf (diff) | |
| download | nixpkgs-72dc15c93dcab5c635d59d6fadac9b214bb74bb6.tar nixpkgs-72dc15c93dcab5c635d59d6fadac9b214bb74bb6.tar.gz nixpkgs-72dc15c93dcab5c635d59d6fadac9b214bb74bb6.tar.bz2 nixpkgs-72dc15c93dcab5c635d59d6fadac9b214bb74bb6.tar.lz nixpkgs-72dc15c93dcab5c635d59d6fadac9b214bb74bb6.tar.xz nixpkgs-72dc15c93dcab5c635d59d6fadac9b214bb74bb6.tar.zst nixpkgs-72dc15c93dcab5c635d59d6fadac9b214bb74bb6.zip | |
Merge pull request #67986 from danieldk/mutter-resume-fix
gnome3.mutter: fix segfault in dri_flush_front_buffer()
Diffstat (limited to 'pkgs/desktops/gnome-3')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/mutter/default.nix | 9 |
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 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 = '' |