From 2481a71c3c745b4070b89dc37832dc45e9be1382 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sun, 1 Jun 2014 05:15:20 +0000 Subject: [PATCH] Disable use of graphite2 on darwin until #2800 is fixed This applies to harfbuzz, pango and texlive. --- pkgs/development/libraries/harfbuzz/default.nix | 2 +- 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 2e596b17af3d..9cdd2a275bff 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 d25e33bd81fc..8059acd22349 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; }; };