diff --git a/pkgs/tools/misc/ttfautohint/default.nix b/pkgs/tools/misc/ttfautohint/default.nix index c302bd15c41e..70320e9dbab8 100644 --- a/pkgs/tools/misc/ttfautohint/default.nix +++ b/pkgs/tools/misc/ttfautohint/default.nix @@ -1,16 +1,23 @@ -{ stdenv, fetchurl, harfbuzz, pkgconfig, qt4 }: +{ stdenv, fetchurl, pkgconfig, freetype, harfbuzz, qtbase }: stdenv.mkDerivation rec { - version = "1.6"; + version = "1.7"; name = "ttfautohint-${version}"; - + src = fetchurl { url = "mirror://savannah/freetype/${name}.tar.gz"; - sha256 = "1r8vsznvh89ay35angxp3w1xljxjlpcv9wdjyn7m61n323vi6474"; + sha256 = "1wh783pyg79ks5qbni61x7qngdhyfc33swrkcl5r1czdwhhlif9x"; }; - + + postPatch = '' + substituteInPlace configure --replace "macx-g++" "macx-clang" + ''; + nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ harfbuzz qt4 ]; + + buildInputs = [ freetype harfbuzz qtbase ]; + + enableParallelBuilding = true; meta = with stdenv.lib; { description = "An automatic hinter for TrueType fonts"; @@ -23,7 +30,7 @@ stdenv.mkDerivation rec { homepage = https://www.freetype.org/ttfautohint; license = licenses.gpl2Plus; # or the FreeType License (BSD + advertising clause) maintainers = with maintainers; [ goibhniu ndowens ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 07518d70b573..b6123e914220 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4807,7 +4807,7 @@ with pkgs; ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { }; - ttfautohint = callPackage ../tools/misc/ttfautohint { }; + ttfautohint = libsForQt5.callPackage ../tools/misc/ttfautohint { }; tty-clock = callPackage ../tools/misc/tty-clock { };