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

fontconfig: propagation no longer needed

This commit is contained in:
Vladimír Čunát 2013-02-10 14:19:34 +01:00
parent 676c43de84
commit c53724f317
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/cairo/default.nix
View File

@ -4,6 +4,7 @@
, xcbSupport ? true # no longer experimental since 1.12 , xcbSupport ? true # no longer experimental since 1.12
, gobjectSupport ? true, glib , gobjectSupport ? true, glib
, stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype, xlibs , stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype, xlibs
, expat
, zlib, libpng, pixman , zlib, libpng, pixman
, gettext, libiconvOrEmpty , gettext, libiconvOrEmpty
}: }:
@ -20,7 +21,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = with xlibs; buildInputs = with xlibs;
[ pkgconfig x11 fontconfig libXrender ] [ pkgconfig x11 fontconfig libXrender expat ]
++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ] ++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ]
# On non-GNU systems we need GNU Gettext for libintl. # On non-GNU systems we need GNU Gettext for libintl.

5
pkgs/development/libraries/fontconfig/default.nix
View File

@ -8,9 +8,10 @@ stdenv.mkDerivation rec {
sha256 = "0llraqw86jmw4vzv7inskp3xxm2gc64my08iwq5mzncgfdbfza4f"; sha256 = "0llraqw86jmw4vzv7inskp3xxm2gc64my08iwq5mzncgfdbfza4f";
}; };
buildInputs = [ pkgconfig freetype ];
propagatedBuildInputs = [ expat ]; # !!! shouldn't be necessary, but otherwise pango breaks buildInputs = [ pkgconfig freetype expat ];
#propagatedBuildInputs = [ expat ]; # !!! shouldn't be necessary, but otherwise pango breaks
configureFlags = "--with-confdir=/etc/fonts --with-cache-dir=/var/cache/fontconfig --disable-docs --with-default-fonts="; configureFlags = "--with-confdir=/etc/fonts --with-cache-dir=/var/cache/fontconfig --disable-docs --with-default-fonts=";