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, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, xz
-, jasper }:
+, jasper, libintlOrEmpty }:

 stdenv.mkDerivation rec {
  name = "gdk-pixbuf-2.28.1";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
  };

  # !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
-  buildInputs = [ libX11 ];
+  buildInputs = [ libX11 libintlOrEmpty ];

  nativeBuildInputs = [ pkgconfig ];