From ca5e5708c82ac03f92257b9c04a5c8643f091aa0 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 27 Nov 2017 01:01:00 +0000 Subject: [PATCH] ttfautohint-nox: init at 1.7 This is ttfautohint without ttfautohintGUI and dependence on Qt. --- pkgs/tools/misc/ttfautohint/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ttfautohint/default.nix b/pkgs/tools/misc/ttfautohint/default.nix index 70320e9dbab8..5dcaea3ec1ea 100644 --- a/pkgs/tools/misc/ttfautohint/default.nix +++ b/pkgs/tools/misc/ttfautohint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, freetype, harfbuzz, qtbase }: +{ stdenv, lib, fetchurl, pkgconfig, freetype, harfbuzz, libiconv, qtbase, enableGUI ? true }: stdenv.mkDerivation rec { version = "1.7"; @@ -15,7 +15,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ freetype harfbuzz qtbase ]; + buildInputs = [ freetype harfbuzz libiconv ] ++ lib.optional enableGUI qtbase; + + configureFlags = lib.optional (!enableGUI) "--with-qt=no"; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6123e914220..682fd7da158a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4808,6 +4808,7 @@ with pkgs; ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { }; ttfautohint = libsForQt5.callPackage ../tools/misc/ttfautohint { }; + ttfautohint-nox = ttfautohint.override { enableGUI = false; }; tty-clock = callPackage ../tools/misc/tty-clock { };