diff options
| author | John Wiegley <johnw@newartisans.com> | 2014-06-01 05:15:20 +0000 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2014-06-01 05:15:20 +0000 |
| commit | 2481a71c3c745b4070b89dc37832dc45e9be1382 (patch) | |
| tree | 60260cd508aae647b0912d3516fa560edc452a95 | |
| parent | 439482cfc1a38837bdf49531b5ff3a3a6d710dd8 (diff) | |
| download | nixpkgs-2481a71c3c745b4070b89dc37832dc45e9be1382.tar nixpkgs-2481a71c3c745b4070b89dc37832dc45e9be1382.tar.gz nixpkgs-2481a71c3c745b4070b89dc37832dc45e9be1382.tar.bz2 nixpkgs-2481a71c3c745b4070b89dc37832dc45e9be1382.tar.lz nixpkgs-2481a71c3c745b4070b89dc37832dc45e9be1382.tar.xz nixpkgs-2481a71c3c745b4070b89dc37832dc45e9be1382.tar.zst nixpkgs-2481a71c3c745b4070b89dc37832dc45e9be1382.zip | |
Disable use of graphite2 on darwin until #2800 is fixed
This applies to harfbuzz, pango and texlive.
| -rw-r--r-- | pkgs/development/libraries/harfbuzz/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 2e596b17af3..9cdd2a275bf 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, glib, freetype, cairo, libintlOrEmpty , icu, graphite2 , 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 +, withGraphite2 ? !stdenv.isDarwin # it is small and major distros do include it }: # TODO: split non-icu and icu lib into different outputs? diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d25e33bd81f..8059acd2234 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10956,7 +10956,7 @@ let libXmu libXext xextproto libSM libICE; ghostscript = ghostscriptX; harfbuzz = harfbuzz.override { - withIcu = true; withGraphite2 = true; + withIcu = true; withGraphite2 = !stdenv.isDarwin; }; }; |