summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorAndrew Childs <lorne@cons.org.nz>2018-10-08 22:21:09 +0900
committerAndrew Childs <lorne@cons.org.nz>2018-10-08 22:23:42 +0900
commite2e23ddd89f613d456fb54398ff8291d1f8ace9c (patch)
treefec4b3ce73b601c6612b57146b24500403436530 /pkgs/desktops
parent3f719b0fad6044ccf8f22ebe22a582f56b447715 (diff)
downloadnixlib-e2e23ddd89f613d456fb54398ff8291d1f8ace9c.tar
nixlib-e2e23ddd89f613d456fb54398ff8291d1f8ace9c.tar.gz
nixlib-e2e23ddd89f613d456fb54398ff8291d1f8ace9c.tar.bz2
nixlib-e2e23ddd89f613d456fb54398ff8291d1f8ace9c.tar.lz
nixlib-e2e23ddd89f613d456fb54398ff8291d1f8ace9c.tar.xz
nixlib-e2e23ddd89f613d456fb54398ff8291d1f8ace9c.tar.zst
nixlib-e2e23ddd89f613d456fb54398ff8291d1f8ace9c.zip
gnome3.mutter: fix crash on startup with nvidia drivers
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/gnome-3/core/mutter/default.nix10
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"