diff options
author | Daiderd Jordan <daiderd@gmail.com> | 2018-08-22 21:49:01 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-22 21:49:01 +0200 |
commit | 6a335f993e87edc7f4aeb933dad5eea99d728386 (patch) | |
tree | 9e8c50dad272a234321489c6e69f1f25c177c6f1 /pkgs/development/libraries | |
parent | 090985a443d3801f2ed04e85c8319ffe591dc96c (diff) | |
parent | 80aca28e34f44a2fe7dafb225dd600980a4d80a7 (diff) | |
download | nixlib-6a335f993e87edc7f4aeb933dad5eea99d728386.tar nixlib-6a335f993e87edc7f4aeb933dad5eea99d728386.tar.gz nixlib-6a335f993e87edc7f4aeb933dad5eea99d728386.tar.bz2 nixlib-6a335f993e87edc7f4aeb933dad5eea99d728386.tar.lz nixlib-6a335f993e87edc7f4aeb933dad5eea99d728386.tar.xz nixlib-6a335f993e87edc7f4aeb933dad5eea99d728386.tar.zst nixlib-6a335f993e87edc7f4aeb933dad5eea99d728386.zip |
Merge pull request #39502 from LnL7/darwin-harfbuzz
harfbuzz: add CoreText support for darwin
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/harfbuzz/default.nix | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index f75d08022c65..383f7f60f9bf 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, pkgconfig, glib, freetype, cairo, libintl , icu, graphite2, harfbuzz # The icu variant uses and propagates the non-icu one. +, ApplicationServices, CoreText +, withCoreText ? false , 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 , python @@ -27,12 +29,17 @@ stdenv.mkDerivation { outputBin = "dev"; configureFlags = [ - ( "--with-graphite2=" + (if withGraphite2 then "yes" else "no") ) # not auto-detected by default - ( "--with-icu=" + (if withIcu then "yes" else "no") ) - ]; + # not auto-detected by default + "--with-graphite2=${if withGraphite2 then "yes" else "no"}" + "--with-icu=${if withIcu then "yes" else "no"}" + ] + ++ stdenv.lib.optional withCoreText "--with-coretext=yes"; nativeBuildInputs = [ pkgconfig libintl ]; - buildInputs = [ glib freetype cairo ]; # recommended by upstream + + buildInputs = [ glib freetype cairo ] # recommended by upstream + ++ stdenv.lib.optionals withCoreText [ ApplicationServices CoreText ]; + propagatedBuildInputs = [] ++ optional withGraphite2 graphite2 ++ optionals withIcu [ icu harfbuzz ]; |