webkitgtk: update to 2.2.4, enable html5 video support

This commit is contained in:
Song Wenwu 2014-01-23 08:12:36 +08:00 committed by Vladimír Čunát
parent 7a211df849
commit 04a55b5e14
2 changed files with 5 additions and 3 deletions

View File

@ -2,10 +2,11 @@
, pkgconfig, which, gettext, gobjectIntrospection , pkgconfig, which, gettext, gobjectIntrospection
, gtk2, gtk3, wayland, libwebp, enchant , gtk2, gtk3, wayland, libwebp, enchant
, libxml2, libsoup, libsecret, libxslt, harfbuzz , libxml2, libsoup, libsecret, libxslt, harfbuzz
, gst-plugins-base
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "webkitgtk-2.2.3"; name = "webkitgtk-2.2.4";
meta = { meta = {
description = "Web content rendering engine, GTK+ port"; description = "Web content rendering engine, GTK+ port";
@ -17,7 +18,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "http://webkitgtk.org/releases/${name}.tar.xz"; url = "http://webkitgtk.org/releases/${name}.tar.xz";
sha256 = "01a69v0aw3bv2zkx6jzk71r3pjlf2xfhxavjnma89kmd78qb7g4l"; sha256 = "0x2d9hds5yazwdakkhrh3dk5qxscb169imi056q2qq53zhdyw6jy";
}; };
patches = [ ./webcore-svg-libxml-cflags.patch ]; patches = [ ./webcore-svg-libxml-cflags.patch ];
@ -32,7 +33,6 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--disable-geolocation" "--disable-geolocation"
"--disable-video" # TODO: gsteramer-1.0
"--enable-introspection" "--enable-introspection"
]; ];
@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gtk2 wayland libwebp enchant gtk2 wayland libwebp enchant
libxml2 libsecret libxslt harfbuzz libxml2 libsecret libxslt harfbuzz
gst-plugins-base
]; ];
propagatedBuildInputs = [ gtk3 libsoup ]; propagatedBuildInputs = [ gtk3 libsoup ];

View File

@ -5703,6 +5703,7 @@ let
harfbuzz = harfbuzz.override { harfbuzz = harfbuzz.override {
withIcu = true; withIcu = true;
}; };
gst-plugins-base = gst_all_1.gst-plugins-base;
}; };
wildmidi = callPackage ../development/libraries/wildmidi { }; wildmidi = callPackage ../development/libraries/wildmidi { };