Merge remote-tracking branch 'upstream/master' into x-updates

Conflicts: pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/gdk-pixbuf/default.nix pkgs/development/libraries/gtk+/2.x.nix pkgs/misc/ghostscript/default.nix pkgs/top-level/all-packages.nix
2013-06-13 17:12:43 +04:00
parent ca67fccbfe 8fe0f0007b
commit 19530856ed
55 changed files with 1041 additions and 148 deletions
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, libjpeg, libpng, libtiff, zlib, pkgconfig, fontconfig, openssl
-, lcms2, freetype, libpaper, jbig2dec, expat
+, lcms2, freetype, libpaper, jbig2dec, expat, libiconvOrEmpty
 , x11Support, x11 ? null
 , cupsSupport ? false, cups ? null
 , gnuFork ? true
@@ -83,6 +83,7 @@ stdenv.mkDerivation rec {
    libpaper jbig2dec expat
  ] ++ stdenv.lib.optionals x11Support [x11 freetype]
    ++ stdenv.lib.optional cupsSupport cups
+    ++ libiconvOrEmpty
    # [] # maybe sometimes jpeg2000 support
    ;