From 5408f303bd33b4bb3852d7faeb15c2ac9162174e Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 27 Jan 2012 15:12:59 +0000 Subject: [PATCH] Pass libpng12 to webkit svn path=/nixpkgs/branches/libpng15/; revision=31884 --- pkgs/top-level/all-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d47356131da..39bc7b436ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4728,13 +4728,14 @@ let inherit (gnome) gtkdoc libsoup; inherit (gtkLibs) gtk atk pango glib; inherit freetype fontconfig gettext gperf curl - libjpeg libtiff libpng libxml2 libxslt sqlite + libjpeg libtiff libxml2 libxslt sqlite icu cairo perl intltool automake libtool pkgconfig autoconf bison libproxy enchant python ruby which flex geoclue; inherit (gst_all) gstreamer gstPluginsBase gstFfmpeg gstPluginsGood; inherit (xlibs) libXt renderproto libXrender; + libpng = libpng12; }; webkitSVN = @@ -4742,13 +4743,14 @@ let inherit (gnome) gtkdoc libsoup; inherit (gtkLibs) gtk atk pango glib; inherit freetype fontconfig gettext gperf curl - libjpeg libtiff libpng libxml2 libxslt sqlite + libjpeg libtiff libxml2 libxslt sqlite icu cairo perl intltool automake libtool pkgconfig autoconf bison libproxy enchant python ruby which flex geoclue; inherit (gst_all) gstreamer gstPluginsBase gstFfmpeg gstPluginsGood; inherit (xlibs) libXt renderproto libXrender; + libpng = libpng12; }; wvstreams = callPackage ../development/libraries/wvstreams { };