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

harfbuzz: major update 0.9.12 -> .24

Browse Source 
Also use deps recommended by upstream (by defaul).
This commit is contained in:
Vladimír Čunát 2013-11-17 14:16:28 +01:00
parent 45859b5f34
commit 3bcc63913b
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,19 +1,18 @@
{ stdenv, fetchurl, pkgconfig, glib, freetype, { stdenv, fetchurl, pkgconfig, glib, freetype, cairo, icu
icu ? null, graphite2 ? null, libintlOrEmpty }: , graphite2 ? null, libintlOrEmpty }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "harfbuzz-0.9.12"; name = "harfbuzz-0.9.24";
src = fetchurl { src = fetchurl {
url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2"; url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2";
sha256 = "19cx5y2m20rp7z5j7mwqfb4ph2g8lrri69zim44x362y4w5gfly6"; sha256 = "08i46xx92hvz2br2d9hdxjgi0g5jglwf5bdfsandxb0qlgc5vwpd";
}; };
buildInputs = [ pkgconfig glib freetype ] buildInputs = [ pkgconfig glib freetype cairo icu ] # recommended by upstream
++ libintlOrEmpty; ++ libintlOrEmpty;
propagatedBuildInputs = [] propagatedBuildInputs = []
++ (stdenv.lib.optionals (icu != null) [icu]) ++ stdenv.lib.optional (graphite2 != null) graphite2
++ (stdenv.lib.optionals (graphite2 != null) [graphite2])
; ;
meta = { meta = {

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

@ -4492,7 +4492,6 @@ 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 {
icu = null;
graphite2 = null; graphite2 = null;
}; };