Merge #22521: fontforge-gtk: Add support for libspiro

pkgs/development/libraries/libspiro/default.nix

@@ -0,0 +1,18 @@
+{stdenv, pkgconfig, fetchurl}:
+
+stdenv.mkDerivation rec {
+  name = "libspiro-${version}";
+  version = "0.5.20150702";
+  src = fetchurl {
+    url = "https://github.com/fontforge/libspiro/releases/download/${version}/${name}.tar.gz";
+    sha256 = "0z4zpxd3nwwchqdsbmmjbp13aw5jg8v5p1993190bpykkrjlh6nv";
+  };
+
+  nativeBuildInputs = [pkgconfig];
+
+  meta = with stdenv.lib; {
+    description = "A library that simplifies the drawing of beautiful curves";
+    homepage = "https://github.com/fontforge/libspiro";
+    license = licenses.gpl3Plus;
+  };
+}

pkgs/tools/misc/fontforge/default.nix

@@ -1,6 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch, lib
 , autoconf, automake, gnum4, libtool, perl, gnulib, uthash, pkgconfig, gettext
 , python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, pango
+, withSpiro ? false, libspiro
 , withGTK ? false, gtk2
 , withPython ? true
 , Carbon ? null, Cocoa ? null
@@ -29,6 +30,7 @@ stdenv.mkDerivation rec {
     autoconf automake gnum4 libtool perl pkgconfig gettext uthash
     python freetype zlib glib libungif libpng libjpeg libtiff libxml2
   ]
+    ++ lib.optionals withSpiro [libspiro]
     ++ lib.optionals withGTK [ gtk2 pango ]
     ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ];
 

pkgs/tools/typesetting/pdf2htmlEX/default.nix

@@ -1,5 +1,6 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig
-, poppler, xlibs, pcre, python, glib, fontforge-gtk, cairo, pango, openjdk8
+, poppler, xlibs, pcre, python, glib, fontforge, cairo, pango, openjdk8
+
 }:
 
 stdenv.mkDerivation rec {
@@ -32,7 +33,7 @@ stdenv.mkDerivation rec {
     cairo
     pango
     (poppler.override { withData = true; })
-    fontforge-gtk
+    fontforge
     openjdk8
   ];
 

pkgs/top-level/all-packages.nix

@@ -1809,6 +1809,7 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
   });
   fontforge-gtk = callPackage ../tools/misc/fontforge {
+    withSpiro = true;
     withGTK = true;
     gtk2 = gtk2-x11;
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
@@ -8740,6 +8741,8 @@ with pkgs;
 
   libsoup = callPackage ../development/libraries/libsoup { };
 
+  libspiro = callPackage ../development/libraries/libspiro {};
+
   libssh = callPackage ../development/libraries/libssh { };
 
   libssh2 = callPackage ../development/libraries/libssh2 { };