cinnamon.muffin: Backport a crash fix

Also re-order the attributes.

1 files changed, 15 insertions, 7 deletions

diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix
index 83e4f5b858bd8..7b9957f2392cc 100644
--- a/pkgs/desktops/cinnamon/muffin/default.nix
+++ b/pkgs/desktops/cinnamon/muffin/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , lib
 , fetchFromGitHub
+, fetchpatch
 , substituteAll
 , cairo
 , cinnamon-desktop
@@ -39,13 +40,6 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" "man" ];
 
-  patches = [
-    (substituteAll {
-      src = ./fix-paths.patch;
-      zenity = gnome.zenity;
-    })
-  ];
-
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
@@ -53,6 +47,20 @@ stdenv.mkDerivation rec {
     hash = "sha256-bHEBzl0aBXsHOhSWJUz428pG5M6L0s/Q6acKO+2oMXo=";
   };
 
+  patches = [
+    (substituteAll {
+      src = ./fix-paths.patch;
+      zenity = gnome.zenity;
+    })
+
+    # compositor: Fix crash when restarting Cinnamon
+    # https://github.com/linuxmint/muffin/pull/655
+    (fetchpatch {
+      url = "https://github.com/linuxmint/muffin/commit/1a941ec603a1565dbd2f943f7da6e877d1541bcb.patch";
+      sha256 = "sha256-6x64rWQ20ZjM9z79Pg6QMDPeFN5VNdDHBueRvy2kA6c=";
+    })
+  ];
+
   nativeBuildInputs = [
     desktop-file-utils
     mesa # needed for gbm