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

Removed Xrender from cairo and add fontconfig to pango on Darwin: this fixes the compilation of graphviz and imagemagick on these platforms

Browse Source
This commit is contained in:
Sander van der Burg 2013-03-14 15:18:55 +01:00
parent 23c78e41db
commit ccb2c7ebb7
2 changed files with 4 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

@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
}; };
buildInputs = buildInputs =
[ pkgconfig x11 fontconfig xlibs.libXrender ] [ pkgconfig x11 fontconfig ]
++ stdenv.lib.optional (!stdenv.isDarwin) xlibs.libXrender
++ 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.

4
pkgs/development/libraries/pango/1.30.x.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }: { stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng, fontconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pango-1.30.1"; name = "pango-1.30.1";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "3a8c061e143c272ddcd5467b3567e970cfbb64d1d1600a8f8e62435556220cbe"; sha256 = "3a8c061e143c272ddcd5467b3567e970cfbb64d1d1600a8f8e62435556220cbe";
}; };
buildInputs = stdenv.lib.optional stdenv.isDarwin gettext; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ gettext fontconfig ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];