From bc312dc7ee644ebad2ea7aacdc1249851ecd759e Mon Sep 17 00:00:00 2001
From: wedens <kirill.wedens@gmail.com>
Date: Fri, 18 Jan 2019 21:32:33 +0700
Subject: [PATCH 1/2] font-manager: 0.7.3.1 -> 0.7.4.1

---
 pkgs/applications/misc/font-manager/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix
index 998074e8aa0f..eaaac0035980 100644
--- a/pkgs/applications/misc/font-manager/default.nix
+++ b/pkgs/applications/misc/font-manager/default.nix
@@ -1,24 +1,25 @@
 { stdenv, fetchFromGitHub, automake, autoconf, libtool,
-  pkgconfig, file, intltool, libxml2, json-glib , sqlite, itstool,
-  librsvg, vala, gnome3, wrapGAppsHook, gobject-introspection
+  pkgconfig, file, libxml2, json-glib , sqlite, itstool,
+  librsvg, vala, gnome3, wrapGAppsHook, gobject-introspection,
+  which
 }:
 
 stdenv.mkDerivation rec {
   name = "font-manager-${version}";
-  version = "0.7.3.1";
+  version = "0.7.4.1";
 
   src = fetchFromGitHub {
     owner = "FontManager";
     repo = "master";
     rev = version;
-    sha256 = "0i65br0bk3r6x8wcl8jhc0v0agl0k6fy5g60ss1bnw4md7ldpgyi";
-    };
+    sha256 = "1zy419zzc95h4gxvl88acqjbwlnmwybj23rx3vkc62j3v3w4nlay";
+  };
 
   nativeBuildInputs = [
     pkgconfig
     automake autoconf libtool
     file
-    intltool
+    which
     itstool
     vala
     gnome3.yelp-tools
@@ -33,7 +34,6 @@ stdenv.mkDerivation rec {
     sqlite
     librsvg
     gnome3.gtk
-    gnome3.libgee
     gnome3.defaultIconTheme
   ];
 
@@ -45,7 +45,6 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [
-    "--with-file-roller"
     "--disable-pycompile"
   ];
 

From baa4b0ca57bcafce50930cf5e03a472b89f5f8de Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sat, 19 Jan 2019 13:51:21 -0500
Subject: [PATCH 2/2] font-manager: switch to meson

---
 .../font-manager/correct-post-install.patch   | 13 ++++++++
 .../misc/font-manager/default.nix             | 33 ++++++++++---------
 2 files changed, 30 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/applications/misc/font-manager/correct-post-install.patch

diff --git a/pkgs/applications/misc/font-manager/correct-post-install.patch b/pkgs/applications/misc/font-manager/correct-post-install.patch
new file mode 100644
index 000000000000..47e9800d2657
--- /dev/null
+++ b/pkgs/applications/misc/font-manager/correct-post-install.patch
@@ -0,0 +1,13 @@
+diff --git a/meson_post_install.py b/meson_post_install.py
+index 8d00e70..c28d19e 100644
+--- a/meson_post_install.py
++++ b/meson_post_install.py
+@@ -7,7 +7,7 @@ prefix = environ['MESON_INSTALL_PREFIX']
+ data_dir = path.join(prefix, 'share')
+ schema_dir = path.join(data_dir, 'glib-2.0', 'schemas')
+ 
+-if not environ['DESTDIR']:
++if not environ.get('DESTDIR'):
+     print('Compiling gsettings schemas...')
+     call(['glib-compile-schemas', schema_dir])
+     print('Updating desktop database...')
diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix
index eaaac0035980..7eb698321c57 100644
--- a/pkgs/applications/misc/font-manager/default.nix
+++ b/pkgs/applications/misc/font-manager/default.nix
@@ -1,11 +1,10 @@
-{ stdenv, fetchFromGitHub, automake, autoconf, libtool,
-  pkgconfig, file, libxml2, json-glib , sqlite, itstool,
-  librsvg, vala, gnome3, wrapGAppsHook, gobject-introspection,
-  which
+{ stdenv, fetchFromGitHub, meson, ninja, gettext, python3,
+  pkgconfig, libxml2, json-glib , sqlite, itstool, librsvg,
+  vala, gnome3, desktop-file-utils, wrapGAppsHook, gobject-introspection
 }:
 
 stdenv.mkDerivation rec {
-  name = "font-manager-${version}";
+  pname = "font-manager";
   version = "0.7.4.1";
 
   src = fetchFromGitHub {
@@ -17,10 +16,12 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkgconfig
-    automake autoconf libtool
-    file
-    which
+    meson
+    ninja
+    gettext
+    python3
     itstool
+    desktop-file-utils
     vala
     gnome3.yelp-tools
     wrapGAppsHook
@@ -37,17 +38,17 @@ stdenv.mkDerivation rec {
     gnome3.defaultIconTheme
   ];
 
-  enableParallelBuilding = true;
+  patches = [ ./correct-post-install.patch ];
 
-  preConfigure = ''
-    NOCONFIGURE=true ./autogen.sh
-    substituteInPlace configure --replace "/usr/bin/file" "${file}/bin/file"
-  '';
-
-  configureFlags = [
-    "--disable-pycompile"
+  mesonFlags = [
+    "-Ddisable_pycompile=true"
   ];
 
+  postPatch = ''
+    chmod +x meson_post_install.py
+    patchShebangs meson_post_install.py
+  '';
+
   meta = {
     homepage = https://fontmanager.github.io/;
     description = "Simple font management for GTK+ desktop environments";