diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-11-04 13:47:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-04 13:47:16 +0100 |
| commit | 033dce35d8956d1c44b4ce771b255a2bedc85abf (patch) | |
| tree | 979250ef3fca543146a02a490d4e7edff13de3ce /pkgs/desktops/gnome-3 | |
| parent | 2adb521d3dc8c66b76af1efd7e778cfb7b6f8fb9 (diff) | |
| parent | e2e23ddd89f613d456fb54398ff8291d1f8ace9c (diff) | |
| download | nixlib-033dce35d8956d1c44b4ce771b255a2bedc85abf.tar nixlib-033dce35d8956d1c44b4ce771b255a2bedc85abf.tar.gz nixlib-033dce35d8956d1c44b4ce771b255a2bedc85abf.tar.bz2 nixlib-033dce35d8956d1c44b4ce771b255a2bedc85abf.tar.lz nixlib-033dce35d8956d1c44b4ce771b255a2bedc85abf.tar.xz nixlib-033dce35d8956d1c44b4ce771b255a2bedc85abf.tar.zst nixlib-033dce35d8956d1c44b4ce771b255a2bedc85abf.zip | |
Merge pull request #48047 from thefloweringash/fix-mutter-crash
gnome3.mutter: fix crash on startup with nvidia drivers
Diffstat (limited to 'pkgs/desktops/gnome-3')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/mutter/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index a08e0fd3cd1a..34830117b777 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -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" |