fontforge: large update with large changes implied

- Things didn't work very well before, as libs were only dlopened and
  not found. Fixes #5716.
- Newer releases need autotools to build (and git), leading to some bloat.
- Also, more things are installed by default, increasing the output size.

pkgs/tools/misc/fontforge/default.nix

@@ -1,39 +1,59 @@
-{ stdenv, fetchurl, gettext, freetype, zlib
+{ stdenv, fetchurl, fetchpatch, lib
-, libungif, libpng, libjpeg, libtiff, libxml2
+, autoconf, automake, gnum4, libtool, git, perl, gnulib, uthash, pkgconfig, gettext
-, withX11 ? false
+, python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2
-, libX11 ? null, lib, xproto ? null, libXt ? null
+, withGTK ? false, gtk2
+, withPython ? false # python-scripting was breaking inconsolata and libertine builds
 }:
 
-let 
+let
-  version = "20110222";
+  version = "20141230"; # also tagged v2.1.0
-  name = "fontforge-${version}";
 in
 
 stdenv.mkDerivation {
-  inherit name;
+  name = "fontforge-${version}";
-  
+
   src = fetchurl {
-    url = "mirror://sourceforge/fontforge/fontforge_full-${version}.tar.bz2";
+    url = "https://github.com/fontforge/fontforge/archive/${version}.tar.gz";
-    sha256 = "0gj342iyd2qmza523r84m65fm7bymcfd4lbllywbfjzq4s0838lg";
+    sha256 = "1xfi13knn1x7hd7pvr6090qz6qfa5znbs85rg1p5mfj377z2h8rb";
   };
-    
+
-  configureFlags = lib.optionalString withX11 "--with-gui=gdraw";
+  patches = [(fetchpatch {
-  
+    name = "use-system-uthash.patch";
+    url = "http://pkgs.fedoraproject.org/cgit/fontforge.git/plain/"
+      + "fontforge-20140813-use-system-uthash.patch?id=8bdf933";
+    sha256 = "0n8i62qv2ygfii535rzp09vvjx4qf9zp5qq7qirrbzm1l9gykcjy";
+  })];
+  patchFlags = "-p0";
+
+  # FIXME: git isn't really used, but configuration fails without it
+  buildInputs = [
+    git autoconf automake gnum4 libtool perl pkgconfig gettext uthash
+    python freetype zlib glib libungif libpng libjpeg libtiff libxml2
+  ]
+    ++ lib.optionals withGTK [ gtk2 ];
+
+  configureFlags =
+    lib.optionals (!withPython) [ "--disable-python-scripting" "--disable-python-extension" ]
+    ++ lib.optional withGTK "--enable-gtk2-use";
+
   preConfigure = ''
-    unpackFile ${freetype.src}
+    cp -r "${gnulib}" ./gnulib
-    freetypeSrcPath=$(echo `pwd`/freetype-*)
+    chmod +w -R ./gnulib
-    configureFlags="$configureFlags --with-freetype-src=$freetypeSrcPath"
+    ./bootstrap --skip-git --gnulib-srcdir=./gnulib
-    
-    substituteInPlace configure \
-      --replace /usr/include /no-such-path \
-      --replace /usr/lib /no-such-path \
-      --replace /usr/local /no-such-path \
-
-
-    export NIX_LDFLAGS="$NIX_LDFLAGS -lz"
   '';
 
-  buildInputs =
+  postInstall =
-    [ gettext freetype zlib libungif libpng libjpeg libtiff libxml2 ]
+    # get rid of the runtime dependency on python
-    ++ lib.optionals withX11 [ libX11 xproto libXt ];
+    lib.optionalString (!withPython) ''
+      rm -r "$out/share/fontforge/python"
+    '';
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "A font editor";
+    homepage = http://fontforge.github.io;
+    platforms = stdenv.lib.platforms.all;
+  };
 }
+

pkgs/top-level/all-packages.nix

@@ -1211,9 +1211,8 @@ let
   flvtool2 = callPackage ../tools/video/flvtool2 { };
 
   fontforge = lowPrio (callPackage ../tools/misc/fontforge { });
-
+  fontforge-gtk = callPackage ../tools/misc/fontforge {
-  fontforgeX = callPackage ../tools/misc/fontforge {
+    withGTK = true;
-    withX11 = true;
   };
 
   forktty = callPackage ../os-specific/linux/forktty {};