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

cairo: pass `libiconvOrEmpty'; fixes builds on non-GNU system

Browse Source
This commit is contained in:
Ludovic Courtès 2012-10-19 14:10:17 +02:00
parent 6f21c88ffc
commit c8d9220257
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@
, gobjectSupport ? true, glib , gobjectSupport ? true, glib
, stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype, xlibs , stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype, xlibs
, zlib, libpng, pixman, libxcb ? null, xcbutil ? null , zlib, libpng, pixman, libxcb ? null, xcbutil ? null
, gettext , gettext, libiconvOrEmpty
}: }:
assert postscriptSupport -> zlib != null; assert postscriptSupport -> zlib != null;
@ -25,7 +25,9 @@ stdenv.mkDerivation rec {
++ 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.
++ stdenv.lib.optional (!stdenv.isLinux) gettext; ++ stdenv.lib.optional (!stdenv.isLinux) gettext
++ libiconvOrEmpty;
propagatedBuildInputs = propagatedBuildInputs =
[ freetype pixman ] ++ [ freetype pixman ] ++