Merge branch 'webkit' of git://github.com/iyzsong/nixpkgs

webkit: update to 2.4.0, add gtk2 version
This commit is contained in:
Shea Levy 2014-03-29 00:41:34 -04:00
commit 4428ed66a2
2 changed files with 18 additions and 5 deletions

View file

@ -3,10 +3,12 @@
, gtk2, gtk3, wayland, libwebp, enchant
, libxml2, libsoup, libsecret, libxslt, harfbuzz
, gst-plugins-base
, withGtk2 ? false
, enableIntrospection ? true
}:
stdenv.mkDerivation rec {
name = "webkitgtk-2.2.4";
name = "webkitgtk-2.4.0";
meta = {
description = "Web content rendering engine, GTK+ port";
@ -18,7 +20,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://webkitgtk.org/releases/${name}.tar.xz";
sha256 = "0x2d9hds5yazwdakkhrh3dk5qxscb169imi056q2qq53zhdyw6jy";
sha256 = "1fyz6ysw7npy5wa7m1zg05zrj0gi0wdlpjbqix03iq4ym36pflnw";
};
patches = [ ./webcore-svg-libxml-cflags.patch ];
@ -31,9 +33,12 @@ stdenv.mkDerivation rec {
done
'';
configureFlags = [
configureFlags = with stdenv.lib; [
"--disable-geolocation"
"--enable-introspection"
(optionalString enableIntrospection "--enable-introspection")
] ++ stdenv.lib.optional withGtk2 [
"--with-gtk=2.0"
"--disable-webkit2"
];
dontAddDisableDepTrack = true;
@ -49,7 +54,10 @@ stdenv.mkDerivation rec {
gst-plugins-base
];
propagatedBuildInputs = [ gtk3 libsoup ];
propagatedBuildInputs = [
libsoup
(if withGtk2 then gtk2 else gtk3)
];
#enableParallelBuilding = true; # build problems on Hydra
}

View file

@ -5928,6 +5928,11 @@ let
gst-plugins-base = gst_all_1.gst-plugins-base;
};
webkitgtk2 = webkitgtk.override {
withGtk2 = true;
enableIntrospection = false;
};
wildmidi = callPackage ../development/libraries/wildmidi { };
wvstreams = callPackage ../development/libraries/wvstreams { };