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: cc39474fd076
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 35151f695efb
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 4, 2018

  1. gnome3.mutter: fix crash on startup with nvidia drivers 

    (cherry picked from commit e2e23dd)
    @thefloweringash
    thefloweringash committed Nov 4, 2018
    Copy the full SHA
    3845a4c View commit details

  2. Merge #49747: gnome3.mutter: fix crash on startup 

    ... with nvidia drivers.
    @vcunat
    vcunat committed Nov 4, 2018
    Copy the full SHA
    35151f6 View commit details
Showing with 9 additions and 1 deletion.
  1. +9 −1 pkgs/desktops/gnome-3/core/mutter/default.nix
10 changes: 9 additions & 1 deletion pkgs/desktops/gnome-3/core/mutter/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
, pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3
, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput
, pipewire, libgudev, libwacom, xwayland, autoreconfHook }:
, pipewire, libgudev, libwacom, xwayland, autoreconfHook, fetchpatch }:

stdenv.mkDerivation rec {
name = "mutter-${version}";
@@ -16,6 +16,14 @@ stdenv.mkDerivation rec {
updateScript = gnome3.updateScript { packageName = "mutter"; attrPath = "gnome3.mutter"; };
};

patches = [
# https://gitlab.gnome.org/GNOME/mutter/merge_requests/172
(fetchpatch {
url = https://gitlab.gnome.org/GNOME/mutter/commit/62660bbd.patch;
sha256 = "1qq8vxlqnyrqh94dc0dh1aj1dsbyw6bwv3x46q5vsscbbxbiv9wk";
})
];

configureFlags = [
"--with-x"
"--disable-static"