Author: urkud
Date: Fri Jan 27 15:12:59 2012
New Revision: 31884
URL: https://nixos.org/websvn/nix/?rev=31884&sc=1
Log:
Pass libpng12 to webkit
Modified:
nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix
Modified: nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix Fri Jan 27
15:11:17 2012 (r31883)
+++ nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix Fri Jan 27
15:12:59 2012 (r31884)
@@ -4728,13 +4728,14 @@
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 @@
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 { };
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
