1 files changed, 12 insertions, 25 deletions
diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gucharmap/default.nix
index ce5e073ac064..b6e8b4c11c03 100644
--- a/nixpkgs/pkgs/desktops/gnome-3/core/gucharmap/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-3/core/gucharmap/default.nix
@@ -1,16 +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
 , itstool
@@ -45,7 +44,7 @@ let
   };
 in stdenv.mkDerivation rec {
   pname = "gucharmap";
-  version = "12.0.1";
+  version = "13.0.0";
 
   outputs = [ "out" "lib" "dev" "devdoc" ];
 
@@ -54,26 +53,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
     docbook_xml_dtd_412
@@ -90,19 +81,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 = {