2 files changed, 15 insertions, 26 deletions
diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
index ce5e073ac064..3d2da33732b2 100644
--- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix
+++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
@@ -1,15 +1,15 @@
 { stdenv
 , intltool
 , fetchFromGitLab
-, fetchpatch
+, meson
+, ninja
 , pkgconfig
+, python3
 , gtk3
 , adwaita-icon-theme
 , glib
 , desktop-file-utils
 , gtk-doc
-, autoconf
-, automake
 , libtool
 , wrapGAppsHook
 , gnome3
@@ -45,7 +45,7 @@ let
   };
 in stdenv.mkDerivation rec {
   pname = "gucharmap";
-  version = "12.0.1";
+  version = "13.0.0";
 
   outputs = [ "out" "lib" "dev" "devdoc" ];
 
@@ -54,25 +54,18 @@ in stdenv.mkDerivation rec {
     owner = "GNOME";
     repo = pname;
     rev = version;
-    sha256 = "0si3ymyfzc5v7ly0dmcs3qgw2wp8cyasycq5hmcr8frl09lr6gkw";
+    sha256 = "17arjigs1lw1h428s9g171n0idrpf9ks23sndldsik1zvvwzlldh";
   };
 
-  patches = [
-    # fix build with Unicode 12.1
-    (fetchpatch {
-      url = "https://salsa.debian.org/gnome-team/gucharmap/raw/de079ad494a15f662416257fca2f2b8db757f4ea/debian/patches/update-to-unicode-12.1.patch";
-      sha256 = "093gqsxfpp3s0b88p1dgkskr4ng3hv8irmxc60l3fdrkl8am00xh";
-    })
-  ];
-
   nativeBuildInputs = [
+    meson
+    ninja
     pkgconfig
+    python3
     wrapGAppsHook
     unzip
     intltool
     itstool
-    autoconf
-    automake
     libtool
     gtk-doc
     docbook_xsl
@@ -90,19 +83,15 @@ in stdenv.mkDerivation rec {
     adwaita-icon-theme
   ];
 
-  configureFlags = [
-    "--with-unicode-data=${ucd}/share/unicode"
-    "--enable-gtk-doc"
+  mesonFlags = [
+    "-Ducd_path=${ucd}/share/unicode"
+    "-Dvapi=false"
   ];
 
   doCheck = true;
 
   postPatch = ''
-    patchShebangs gucharmap/gen-guch-unicode-tables.pl
-  '';
-
-  preConfigure = ''
-    NOCONFIGURE=1 ./autogen.sh
+    patchShebangs data/meson_desktopfile.py gucharmap/gen-guch-unicode-tables.pl gucharmap/meson_compileschemas.py
   '';
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/games/five-or-more/default.nix
index b4c6eaaec1bf..4d0512f1adbc 100644
--- a/pkgs/desktops/gnome-3/games/five-or-more/default.nix
+++ b/pkgs/desktops/gnome-3/games/five-or-more/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "five-or-more";
-  version = "3.32.0";
+  version = "3.32.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/five-or-more/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0v52i22ygv6y4zqs8nyb1qmacmj9whhqrw7qss6vn7by4nsikhrn";
+    sha256 = "0xw05dd2dwi9vsph9h158b4n89s5k07xrh6bjz1icm0pdmjwhpgk";
   };
 
   nativeBuildInputs = [
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Five_or_more;
+    homepage = "https://wiki.gnome.org/Apps/Five_or_more";
     description = "Remove colored balls from the board by forming lines";
     maintainers = gnome3.maintainers;
     license = licenses.gpl2;