Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8c772a618356
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 72dc15c93dca
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 3, 2019

  1. gnome3.mutter: fix segfault in dri_flush_front_buffer() 

    More details:

https://gitlab.gnome.org/GNOME/mutter/commit/56ddaaa3809240a357b5e19b5789d1aa49aaecc3
    @danieldk
    danieldk committed Sep 3, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    sikmir Nikolay Korotkiy
    GPG key ID: D1DE6D7F693663A5
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7ddd49a View commit details

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

    gnome3.mutter: fix segfault in dri_flush_front_buffer()
    @worldofpeace
    worldofpeace authored Sep 3, 2019
    Copy the full SHA
    72dc15c View commit details
Showing with 8 additions and 1 deletion.
  1. +8 −1 pkgs/desktops/gnome-3/core/mutter/default.nix
9 changes: 8 additions & 1 deletion pkgs/desktops/gnome-3/core/mutter/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 = ''