Author: raskin
Date: Sat Mar 5 07:28:50 2011
New Revision: 26166
URL: https://svn.nixos.org/websvn/nix/?rev=26166&sc=1
Log:
Getting WebKit overrides less wrong so no libsoup 2.28 gets used
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Mar 4 21:04:44
2011 (r26165)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Mar 5 07:28:50
2011 (r26166)
@@ -4184,16 +4184,19 @@
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;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
