diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-03-14 14:15:06 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-03-22 16:50:11 -0500 |
| commit | ed2a9cf65fe2bf02bc3e7070ca4b124260d99585 (patch) | |
| tree | eabfdcf2e6203d6da7f1ada80a785455533c9c80 /pkgs/development/libraries/harfbuzz/default.nix | |
| parent | 9e75fb5eb4f26de4e551137c3caaa78b9bf8b050 (diff) | |
| download | nixlib-ed2a9cf65fe2bf02bc3e7070ca4b124260d99585.tar nixlib-ed2a9cf65fe2bf02bc3e7070ca4b124260d99585.tar.gz nixlib-ed2a9cf65fe2bf02bc3e7070ca4b124260d99585.tar.bz2 nixlib-ed2a9cf65fe2bf02bc3e7070ca4b124260d99585.tar.lz nixlib-ed2a9cf65fe2bf02bc3e7070ca4b124260d99585.tar.xz nixlib-ed2a9cf65fe2bf02bc3e7070ca4b124260d99585.tar.zst nixlib-ed2a9cf65fe2bf02bc3e7070ca4b124260d99585.zip | |
treewide: remove libintl hacks
Diffstat (limited to 'pkgs/development/libraries/harfbuzz/default.nix')
| -rw-r--r-- | pkgs/development/libraries/harfbuzz/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index bb68ae94a7f0..9b2e2e27f42e 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, freetype, cairo, libintlOrEmpty +{ stdenv, fetchurl, pkgconfig, glib, freetype, cairo, libintl , icu, graphite2, harfbuzz # The icu variant uses and propagates the non-icu one. , withIcu ? false # recommended by upstream as default, but most don't needed and it's big , withGraphite2 ? true # it is small and major distros do include it @@ -25,9 +25,8 @@ stdenv.mkDerivation { ( "--with-icu=" + (if withIcu then "yes" else "no") ) ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib freetype cairo ] # recommended by upstream - ++ libintlOrEmpty; + nativeBuildInputs = [ pkgconfig libintl ]; + buildInputs = [ glib freetype cairo ]; # recommended by upstream propagatedBuildInputs = [] ++ optional withGraphite2 graphite2 ++ optionals withIcu [ icu harfbuzz ] |