public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pass libpng12 to webkit

Browse Source 
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
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/top-level/all-packages.nix
View File

@ -4728,13 +4728,14 @@ let
inherit (gnome) gtkdoc libsoup; inherit (gnome) gtkdoc libsoup;
inherit (gtkLibs) gtk atk pango glib; inherit (gtkLibs) gtk atk pango glib;
inherit freetype fontconfig gettext gperf curl inherit freetype fontconfig gettext gperf curl
libjpeg libtiff libpng libxml2 libxslt sqlite libjpeg libtiff libxml2 libxslt sqlite
icu cairo perl intltool automake libtool icu cairo perl intltool automake libtool
pkgconfig autoconf bison libproxy enchant pkgconfig autoconf bison libproxy enchant
python ruby which flex geoclue; python ruby which flex geoclue;
inherit (gst_all) gstreamer gstPluginsBase gstFfmpeg inherit (gst_all) gstreamer gstPluginsBase gstFfmpeg
gstPluginsGood; gstPluginsGood;
inherit (xlibs) libXt renderproto libXrender; inherit (xlibs) libXt renderproto libXrender;
libpng = libpng12;
}; };
webkitSVN = webkitSVN =
@ -4742,13 +4743,14 @@ let
inherit (gnome) gtkdoc libsoup; inherit (gnome) gtkdoc libsoup;
inherit (gtkLibs) gtk atk pango glib; inherit (gtkLibs) gtk atk pango glib;
inherit freetype fontconfig gettext gperf curl inherit freetype fontconfig gettext gperf curl
libjpeg libtiff libpng libxml2 libxslt sqlite libjpeg libtiff libxml2 libxslt sqlite
icu cairo perl intltool automake libtool icu cairo perl intltool automake libtool
pkgconfig autoconf bison libproxy enchant pkgconfig autoconf bison libproxy enchant
python ruby which flex geoclue; python ruby which flex geoclue;
inherit (gst_all) gstreamer gstPluginsBase gstFfmpeg inherit (gst_all) gstreamer gstPluginsBase gstFfmpeg
gstPluginsGood; gstPluginsGood;
inherit (xlibs) libXt renderproto libXrender; inherit (xlibs) libXt renderproto libXrender;
libpng = libpng12;
}; };
wvstreams = callPackage ../development/libraries/wvstreams { }; wvstreams = callPackage ../development/libraries/wvstreams { };