Merge pull request #48047 from thefloweringash/fix-mutter-crash

gnome3.mutter: fix crash on startup with nvidia drivers
This commit is contained in:
Jan Tojnar 2018-11-04 13:47:16 +01:00 committed by GitHub
commit 033dce35d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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"