diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-10-19 14:10:17 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-10-19 14:10:24 +0200 |
| commit | c8d9220257c0503047169446e2c4760928e97b25 (patch) | |
| tree | 38013d9de6d6706abc639b603fa06cb1d7278db3 /pkgs/development/libraries/cairo/default.nix | |
| parent | 6f21c88ffcd38a34a61aec9226d720343218ba35 (diff) | |
| download | nixpkgs-c8d9220257c0503047169446e2c4760928e97b25.tar nixpkgs-c8d9220257c0503047169446e2c4760928e97b25.tar.gz nixpkgs-c8d9220257c0503047169446e2c4760928e97b25.tar.bz2 nixpkgs-c8d9220257c0503047169446e2c4760928e97b25.tar.lz nixpkgs-c8d9220257c0503047169446e2c4760928e97b25.tar.xz nixpkgs-c8d9220257c0503047169446e2c4760928e97b25.tar.zst nixpkgs-c8d9220257c0503047169446e2c4760928e97b25.zip | |
cairo: pass `libiconvOrEmpty'; fixes builds on non-GNU system
Diffstat (limited to 'pkgs/development/libraries/cairo/default.nix')
| -rw-r--r-- | pkgs/development/libraries/cairo/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index b24cc668bf1..d21f303e741 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -5,7 +5,7 @@ , gobjectSupport ? true, glib , stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype, xlibs , zlib, libpng, pixman, libxcb ? null, xcbutil ? null -, gettext +, gettext, libiconvOrEmpty }: assert postscriptSupport -> zlib != null; @@ -25,7 +25,9 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ] # On non-GNU systems we need GNU Gettext for libintl. - ++ stdenv.lib.optional (!stdenv.isLinux) gettext; + ++ stdenv.lib.optional (!stdenv.isLinux) gettext + + ++ libiconvOrEmpty; propagatedBuildInputs = [ freetype pixman ] ++ |