BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Getting WebKit overrides less wrong so no libsoup 2.28 gets used

Browse source 
svn path=/nixpkgs/trunk/; revision=26166
This commit is contained in:
Michael Raskin 2011-03-05 07:28:50 +00:00
parent 32b0f76435
commit 56536b3498
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/top-level/all-packages.nix
View file

@ -4184,16 +4184,19 @@ let
webkit = let p = applyGlobalOverrides (x : {
libsoup = x.gnome28.libsoup_2_31;
gnome28 = x.gnome28 // {
libsoup = x.gnome28.libsoup_2_31;
};
});
in
(builderDefsPackage ../development/libraries/webkit {
inherit (p.gnome28) gtkdoc libsoup;
(p.builderDefsPackage ../development/libraries/webkit {
inherit (p.gnome28) gtkdoc;
inherit (p.gtkLibs) gtk atk pango glib;
inherit (p) freetype fontconfig gettext gperf curl
libjpeg libtiff libpng libxml2 libxslt sqlite
icu cairo perl intltool automake libtool
pkgconfig autoconf bison libproxy enchant
python ruby which flex geoclue;
python ruby which flex geoclue libsoup;
inherit (p.gst_all) gstreamer gstPluginsBase gstFfmpeg
gstPluginsGood;
inherit (p.xlibs) libXt renderproto libXrender;