diff options
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/cairo/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/libraries/fontconfig/default.nix | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 694662e794d6..a70559f7469e 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -4,6 +4,7 @@ , xcbSupport ? true # no longer experimental since 1.12 , gobjectSupport ? true, glib , stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype, xlibs +, expat , zlib, libpng, pixman , gettext, libiconvOrEmpty }: @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { }; buildInputs = with xlibs; - [ pkgconfig x11 fontconfig libXrender ] + [ pkgconfig x11 fontconfig libXrender expat ] ++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ] # On non-GNU systems we need GNU Gettext for libintl. diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index b3b96b35bf11..c8cc52bf7d6e 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -8,9 +8,10 @@ stdenv.mkDerivation rec { 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="; |