Merge branch 'master' into staging

3 files changed, 66 insertions, 15 deletions

diff --git a/pkgs/tools/misc/otfcc/default.nix b/pkgs/tools/misc/otfcc/default.nix
new file mode 100644
index 000000000000..f55f4e53296d
--- /dev/null
+++ b/pkgs/tools/misc/otfcc/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, premake5, hostPlatform }:
+
+stdenv.mkDerivation rec {
+  name = "otfcc-${version}";
+  version = "0.8.6";
+
+  src = fetchurl {
+    url = "https://github.com/caryll/otfcc/archive/v${version}.tar.gz";
+    sha256 = "0kap52bzrn21fmph8j2pc71f80f38ak1p2fcczzmrh0hb1r9c8dd";
+  };
+
+  nativeBuildInputs = [ premake5 ];
+
+  configurePhase = ''
+    premake5 gmake
+  '';
+
+  preBuild = "cd build/gmake";
+
+  makeFlags = ''config=release_${if hostPlatform.isi686 then "x86" else "x64"}'';
+
+  postBuild = "cd ../..";
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp bin/release-x*/otfcc* $out/bin/
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Optimized OpenType builder and inspector";
+    homepage = https://github.com/caryll/otfcc;
+    license = licenses.asl20;
+    platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
+    maintainers = with maintainers; [ jfrankenau ttuegel ];
+  };
+
+}
diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix
index 9da2ebc07fc0..e8170edb7f22 100644
--- a/pkgs/tools/misc/qt5ct/default.nix
+++ b/pkgs/tools/misc/qt5ct/default.nix
@@ -4,24 +4,27 @@ let inherit (stdenv.lib) getDev; in
 
 stdenv.mkDerivation rec {
   name = "qt5ct-${version}";
-  version = "0.33";
+  version = "0.34";
 
   src = fetchurl {
-    url = "mirror://sourceforge/qt5ct/qt5ct-${version}.tar.bz2";
-    sha256 = "0by0wz40rl9gxvwbd85j0y5xy9mjab1cya96rv48x677v95lhm9f";
+    url = "mirror://sourceforge/qt5ct/${name}.tar.bz2";
+    sha256 = "0aqbilz7acx077zg5rwf2909xabw16047yjdn9nx2gmhp31y00pl";
   };
 
-  propagatedBuildInputs = [ qtbase qtsvg qttools ];
-  nativeBuildInputs = [ qmake ];
+  nativeBuildInputs = [ qmake qttools ];
 
-  buildInputs = [ qtbase qtsvg ];
+  buildInputs = [ qtbase ];
 
-  qmakeFlags = [ ''LRELEASE_EXECUTABLE=${getDev qttools}/bin/lrelease'' ];
+  qmakeFlags = [
+    "LRELEASE_EXECUTABLE=${getDev qttools}/bin/lrelease"
+  ];
 
   preConfigure = ''
-    qmakeFlags="$qmakeFlags PLUGINDIR=$out/$qtPluginPrefix"
+    qmakeFlags+=" PLUGINDIR=$out/$qtPluginPrefix"
   '';
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Qt5 Configuration Tool";
     homepage = https://www.opendesktop.org/content/show.php?content=168066;
diff --git a/pkgs/tools/misc/ttfautohint/default.nix b/pkgs/tools/misc/ttfautohint/default.nix
index c302bd15c41e..5dcaea3ec1ea 100644
--- a/pkgs/tools/misc/ttfautohint/default.nix
+++ b/pkgs/tools/misc/ttfautohint/default.nix
@@ -1,16 +1,25 @@
-{ stdenv, fetchurl, harfbuzz, pkgconfig, qt4 }:
+{ stdenv, lib, fetchurl, pkgconfig, freetype, harfbuzz, libiconv, qtbase, enableGUI ? true }:
 
 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 libiconv ] ++ lib.optional enableGUI qtbase;
+
+  configureFlags = lib.optional (!enableGUI) "--with-qt=no";
+
+  enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     description = "An automatic hinter for TrueType fonts";
@@ -23,7 +32,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;
   };
 
 }