cinnamon.muffin: 5.2.0 -> 5.4.4

Rebased on mutter 3.36.0-0ubuntu0.20.04.1.

pkgs/desktops/cinnamon/muffin/default.nix

@@ -1,100 +1,104 @@
-{ fetchFromGitHub
+{ stdenv
+, lib
+, fetchFromGitHub
+, substituteAll
+, cairo
 , cinnamon-desktop
+, dbus
+, desktop-file-utils
 , glib
-, file
 , gnome
-, gnome-doc-utils
-, fetchpatch
 , gobject-introspection
+, graphene
 , gtk3
-, intltool
 , json-glib
+, libcanberra
+, libdrm
+, libgnomekbd
+, libgudev
 , libinput
 , libstartup_notification
-, libXtst
+, libwacom
+, libXdamage
 , libxkbcommon
+, libXtst
+, mesa
+, meson
+, ninja
+, pipewire
 , pkg-config
-, lib
+, python3
-, stdenv
 , udev
-, xorg
 , wrapGAppsHook
-, pango
+, xorgserver
-, cairo
-, gtk-doc
-, docbook_xsl
-, docbook_xml_dtd_43
-, docbook_xml_dtd_42
-, docbook_xml_dtd_412
-, autoconf
-, automake
-, gettext
-, libtool
 }:
 
-# it's a frankensteins monster with some cinnamon sparkles added on top of it
-
 stdenv.mkDerivation rec {
   pname = "muffin";
-  version = "5.2.0";
+  version = "5.4.4";
+
+  outputs = [ "out" "dev" "man" ];
+
+  patches = [
+    (substituteAll {
+      src = ./fix-paths.patch;
+      zenity = gnome.zenity;
+    })
+  ];
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-WAp0HbfRtwsPjJX1kPBqUStqLaudQPZ8E+h4jmggmw8=";
+    hash = "sha256-u3PNSyjxtPLFdA+2Iz+NuqlcQC9IwsFb7Tb5eVAJunY=";
   };
 
-  buildInputs = [
+  nativeBuildInputs = [
-    gtk3
+    desktop-file-utils
-    glib
+    mesa # needed for gbm
-    pango
+    meson
-    cairo
+    ninja
-    json-glib
+    pkg-config
-    cinnamon-desktop
+    python3
-    xorg.libXcomposite
+    wrapGAppsHook
-    xorg.libXcursor
+    xorgserver # for cvt command
-    xorg.libXdamage
+  ];
-    xorg.libXext
-    xorg.libXfixes
-    xorg.libXi
-    xorg.libxkbfile
-    xorg.xkeyboardconfig
 
-    libxkbcommon
+  buildInputs = [
-    gnome.zenity
+    cairo
+    cinnamon-desktop
+    dbus
+    glib
+    gobject-introspection
+    gtk3
+    libcanberra
+    libdrm
+    libgnomekbd
+    libgudev
     libinput
     libstartup_notification
-    libXtst
+    libwacom
+    libXdamage
+    libxkbcommon
+    pipewire
     udev
-    gobject-introspection
   ];
 
-  nativeBuildInputs = [
+  propagatedBuildInputs = [
-    autoconf
+    # required for pkg-config to detect muffin-clutter
-    automake
+    json-glib
-    gettext
+    libXtst
-    libtool
+    graphene
-    wrapGAppsHook
-    pkg-config
-    intltool
-
-    gnome-doc-utils
-    gtk-doc
-    docbook_xsl
-    docbook_xml_dtd_43
-    docbook_xml_dtd_42
-    docbook_xml_dtd_412
   ];
 
-  preConfigure = ''
+  postPatch = ''
-    NOCONFIGURE=1 ./autogen.sh
+    patchShebangs src/backends/native/gen-default-modes.py
   '';
 
   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;
+    license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = teams.cinnamon.members;
   };

pkgs/desktops/cinnamon/muffin/fix-paths.patch

@@ -0,0 +1,13 @@
+diff --git a/src/core/util.c b/src/core/util.c
+index 57b73747d..f424cc81c 100644
+--- a/src/core/util.c
++++ b/src/core/util.c
+@@ -636,7 +636,7 @@ meta_show_dialog (const char *type,
+ 
+   args = g_ptr_array_new ();
+ 
+-  append_argument (args, "zenity");
++  append_argument (args, "@zenity@/bin/zenity");
+   append_argument (args, type);
+ 
+   if (display)