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

pango: big update; it was waiting on fontconfig-2.11

Browse Source
This commit is contained in:
Vladimír Čunát 2014-10-19 20:28:23 +02:00
parent 27968ece0f
commit d7a57963fa
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/libraries/pango/default.nix
View File

@ -1,30 +1,35 @@
{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng, harfbuzz, fontconfig { stdenv, fetchurl, pkgconfig, x11, glib, cairo, libpng, harfbuzz
, libintlOrEmpty, gobjectIntrospection }: , fontconfig, freetype, libintlOrEmpty, gobjectIntrospection
}:
let
ver_maj = "1.36";
ver_min = "8";
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pango-1.32.5"; #.6 and higher need fontconfig-2.11.* which is troublesome name = "pango-${ver_maj}.${ver_min}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/pango/1.32/${name}.tar.xz"; url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz";
sha256 = "08aqis6j8nd1lb4f2h4h9d9kjvp54iwf8zvqzss0qn4v7nfcjyvx"; sha256 = "01rdzjh68w8l5zn0648yibyarj8p6g7yfn59nw5awaz1i8dvbnqq";
}; };
buildInputs = with stdenv.lib; buildInputs = with stdenv.lib;
optional (!stdenv.isDarwin) gobjectIntrospection # build problems of itself and flex optional (!stdenv.isDarwin) gobjectIntrospection # build problems of itself and flex
++ optionals stdenv.isDarwin [ gettext fontconfig ]; ++ optionals stdenv.isDarwin [ gettext fontconfig ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ x11 glib cairo libpng harfbuzz ] ++ libintlOrEmpty; propagatedBuildInputs = [ x11 glib cairo libpng fontconfig freetype harfbuzz ] ++ libintlOrEmpty;
enableParallelBuilding = true; enableParallelBuilding = true;
doCheck = false; # test-layout fails on 1.36.8
# jww (2014-05-05): The tests currently fail on Darwin: # jww (2014-05-05): The tests currently fail on Darwin:
# #
# ERROR:testiter.c:139:iter_char_test: assertion failed: (extents.width == x1 - x0) # ERROR:testiter.c:139:iter_char_test: assertion failed: (extents.width == x1 - x0)
# .../bin/sh: line 5: 14823 Abort trap: 6 srcdir=. PANGO_RC_FILE=./pangorc ${dir}$tst # .../bin/sh: line 5: 14823 Abort trap: 6 srcdir=. PANGO_RC_FILE=./pangorc ${dir}$tst
# FAIL: testiter # FAIL: testiter
doCheck = !stdenv.isDarwin;
postInstall = "rm -rf $out/share/gtk-doc"; postInstall = "rm -rf $out/share/gtk-doc";
meta = { meta = {