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

Remove the breaking override for WebKit

Browse Source 
svn path=/nixpkgs/trunk/; revision=26159
This commit is contained in:
Michael Raskin 2011-03-04 13:08:11 +00:00
parent 370a89b5ad
commit f084b30926
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3283,6 +3283,8 @@ let
}); });
glib_2_28 = callPackage ../development/libraries/glib/2.28.x.nix {};
gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp { gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp {
inherit (gnome) gtk; inherit (gnome) gtk;
gtksharp = gtksharp2; gtksharp = gtksharp2;
@ -4180,18 +4182,22 @@ let
vxl = callPackage ../development/libraries/vxl { }; vxl = callPackage ../development/libraries/vxl { };
webkit = ((builderDefsPackage ../development/libraries/webkit { webkit = let p = applyGlobalOverrides (x : {
inherit (gnome28) gtkdoc libsoup; libsoup = x.gnome28.libsoup_2_31;
inherit (gtkLibs) gtk atk pango glib; });
inherit freetype fontconfig gettext gperf curl in
(builderDefsPackage ../development/libraries/webkit {
inherit (p.gnome28) gtkdoc libsoup;
inherit (p.gtkLibs) gtk atk pango glib;
inherit (p) freetype fontconfig gettext gperf curl
libjpeg libtiff libpng libxml2 libxslt sqlite libjpeg libtiff libpng 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 (p.gst_all) gstreamer gstPluginsBase gstFfmpeg
gstPluginsGood; gstPluginsGood;
inherit (xlibs) libXt renderproto libXrender; inherit (p.xlibs) libXt renderproto libXrender;
}).deepOverride {libsoup = gnome28.libsoup_2_31;}); });
wvstreams = callPackage ../development/libraries/wvstreams { }; wvstreams = callPackage ../development/libraries/wvstreams { };