ttfautohint: 1.6 -> 1.7, Qt 4 -> Qt 5, support darwin

This commit is contained in:
Orivej Desh 2017-11-27 00:44:09 +00:00
parent 94713c6c09
commit 7adc86753a
2 changed files with 15 additions and 8 deletions

View file

@ -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;
};
}

View file

@ -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 { };