public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

harfbuzz by default: don't use icu and do use graphite2

Browse Source 
Also fix detection, so texLive builds now.
This commit is contained in:
Vladimír Čunát 2013-11-24 13:51:12 +01:00
parent 55f40dfbec
commit a829337ea6
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/development/libraries/harfbuzz/default.nix
View File

@ -1,5 +1,11 @@
{ stdenv, fetchurl, pkgconfig, glib, freetype, cairo, icu { stdenv, fetchurl, pkgconfig, glib, freetype, cairo, libintlOrEmpty
, graphite2 ? null, 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
}:
# TODO: split non-icu and icu lib into different outputs?
# (icu is a ~30 MB dependency, the rest is very small in comparison)
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "harfbuzz-0.9.24"; name = "harfbuzz-0.9.24";
@ -9,10 +15,16 @@ stdenv.mkDerivation rec {
sha256 = "08i46xx92hvz2br2d9hdxjgi0g5jglwf5bdfsandxb0qlgc5vwpd"; sha256 = "08i46xx92hvz2br2d9hdxjgi0g5jglwf5bdfsandxb0qlgc5vwpd";
}; };
buildInputs = [ pkgconfig glib freetype cairo icu ] # recommended by upstream configureFlags = [
( "--with-graphite2=" + (if withGraphite2 then "yes" else "no") ) # not auto-detected by default
( "--with-icu=" + (if withIcu then "yes" else "no") )
];
buildInputs = [ pkgconfig glib freetype cairo ] # recommended by upstream
++ libintlOrEmpty; ++ libintlOrEmpty;
propagatedBuildInputs = [] propagatedBuildInputs = []
++ stdenv.lib.optional (graphite2 != null) graphite2 ++ stdenv.lib.optional withGraphite2 graphite2
++ stdenv.lib.optional withIcu icu
; ;
meta = { meta = {

6
pkgs/top-level/all-packages.nix
View File

@ -4501,9 +4501,7 @@ let
heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { }; heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { };
harfbuzz = callPackage ../development/libraries/harfbuzz { harfbuzz = callPackage ../development/libraries/harfbuzz { };
graphite2 = null;
};
hawknl = callPackage ../development/libraries/hawknl { }; hawknl = callPackage ../development/libraries/hawknl { };
@ -10196,7 +10194,7 @@ let
libXmu libXext xextproto libSM libICE; libXmu libXext xextproto libSM libICE;
ghostscript = ghostscriptX; ghostscript = ghostscriptX;
harfbuzz = harfbuzz.override { harfbuzz = harfbuzz.override {
inherit icu graphite2; withIcu = true; withGraphite2 = true;
}; };
}; };