diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-11-27 01:01:00 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2017-11-27 01:01:00 +0000 |
| commit | ca5e5708c82ac03f92257b9c04a5c8643f091aa0 (patch) | |
| tree | 3cc73014bbb0cf992f15a9e063b6bd094747ac60 | |
| parent | 37056c3724aaf1602bfff9cf138c65b2cb657263 (diff) | |
| download | nixpkgs-ca5e5708c82ac03f92257b9c04a5c8643f091aa0.tar nixpkgs-ca5e5708c82ac03f92257b9c04a5c8643f091aa0.tar.gz nixpkgs-ca5e5708c82ac03f92257b9c04a5c8643f091aa0.tar.bz2 nixpkgs-ca5e5708c82ac03f92257b9c04a5c8643f091aa0.tar.lz nixpkgs-ca5e5708c82ac03f92257b9c04a5c8643f091aa0.tar.xz nixpkgs-ca5e5708c82ac03f92257b9c04a5c8643f091aa0.tar.zst nixpkgs-ca5e5708c82ac03f92257b9c04a5c8643f091aa0.zip | |
ttfautohint-nox: init at 1.7
This is ttfautohint without ttfautohintGUI and dependence on Qt.
| -rw-r--r-- | pkgs/tools/misc/ttfautohint/default.nix | 6 | ||||
| -rw-r--r-- | 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 70320e9dbab..5dcaea3ec1e 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 b6123e91422..682fd7da158 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 { }; |