1 files changed, 7 insertions, 22 deletions
diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix
index 2913d4761ff8..93079e21d3d1 100644
--- a/pkgs/desktops/cinnamon/muffin/default.nix
+++ b/pkgs/desktops/cinnamon/muffin/default.nix
@@ -13,8 +13,8 @@
 , libstartup_notification
 , libXtst
 , libxkbcommon
-, pkgconfig
-, stdenv
+, pkg-config
+, lib, stdenv
 , udev
 , xorg
 , wrapGAppsHook
@@ -35,30 +35,15 @@
 
 stdenv.mkDerivation rec {
   pname = "muffin";
-  version = "4.4.2";
+  version = "4.6.3";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    sha256 = "1kzjw4a5p69j8x55vpbpn6gy8pkbbyii6kzw2nzbypmipgnnijw8";
+    sha256 = "1p8irzf20wari1id5rfx5sypywih1jsrmn0f83zlyhc5fxg02r5p";
   };
 
-  patches = [
-    # backport patch that disables wayland components via build flags
-    # https://github.com/linuxmint/muffin/pull/548#issuecomment-578316820
-    (fetchpatch {
-      url = "https://github.com/linuxmint/muffin/commit/f78bf5b309b3d306848f47cc241b31e9399999a7.patch";
-      sha256 = "1c79aa9w2v23xlz86x3l42pavwrqx5d6nmfd9nms29hjsk8mpf4i";
-    })
-    # mute some warnings that caused build failures
-    # https://github.com/linuxmint/muffin/issues/535#issuecomment-536917143
-    (fetchpatch {
-      url = "https://src.fedoraproject.org/rpms/muffin/raw/6b0af3a22173e374804371a1cca74e23d696dd37/f/0001-fix-warnings-when-compiling.patch";
-      sha256 = "15wdbn3afn3103v7rq1icp8n0vqqwrrya03h0g2rzqlrsc7wrvzw";
-    })
-  ];
-
   buildInputs = [
     gtk3
     glib
@@ -90,7 +75,7 @@ stdenv.mkDerivation rec {
     gettext
     libtool
     wrapGAppsHook
-    pkgconfig
+    pkg-config
     intltool
 
     gnome-doc-utils
@@ -105,11 +90,11 @@ stdenv.mkDerivation rec {
     NOCONFIGURE=1 ./autogen.sh
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/linuxmint/muffin";
     description = "The window management library for the Cinnamon desktop (libmuffin) and its sample WM binary (muffin)";
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = [ maintainers.mkg20001 ];
+    maintainers = teams.cinnamon.members;
   };
 }