Pass libpng12 to webkit

svn path=/nixpkgs/branches/libpng15/; revision=31884
This commit is contained in:
Yury G. Kudryashov 2012-01-27 15:12:59 +00:00
parent 84b0c3de57
commit 5408f303bd

View File

@ -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 { };