diff options
| author | Song Wenwu <iyzsong@gmail.com> | 2014-01-23 08:12:36 +0800 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-01-23 22:29:24 +0100 |
| commit | 04a55b5e14779f3167f0312e9c9cac646036a79c (patch) | |
| tree | e4bc965f0c9f835ad18bf33f21dc46b5841e10fd | |
| parent | 7a211df8496ac0dac6881e3578908a85b2360245 (diff) | |
| download | nixlib-04a55b5e14779f3167f0312e9c9cac646036a79c.tar nixlib-04a55b5e14779f3167f0312e9c9cac646036a79c.tar.gz nixlib-04a55b5e14779f3167f0312e9c9cac646036a79c.tar.bz2 nixlib-04a55b5e14779f3167f0312e9c9cac646036a79c.tar.lz nixlib-04a55b5e14779f3167f0312e9c9cac646036a79c.tar.xz nixlib-04a55b5e14779f3167f0312e9c9cac646036a79c.tar.zst nixlib-04a55b5e14779f3167f0312e9c9cac646036a79c.zip | |
webkitgtk: update to 2.2.4, enable html5 video support
| -rw-r--r-- | pkgs/development/libraries/webkitgtk/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 766bb7154746..8f8551ac9b63 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -2,10 +2,11 @@ , pkgconfig, which, gettext, gobjectIntrospection , gtk2, gtk3, wayland, libwebp, enchant , libxml2, libsoup, libsecret, libxslt, harfbuzz +, gst-plugins-base }: stdenv.mkDerivation rec { - name = "webkitgtk-2.2.3"; + name = "webkitgtk-2.2.4"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -17,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "01a69v0aw3bv2zkx6jzk71r3pjlf2xfhxavjnma89kmd78qb7g4l"; + sha256 = "0x2d9hds5yazwdakkhrh3dk5qxscb169imi056q2qq53zhdyw6jy"; }; patches = [ ./webcore-svg-libxml-cflags.patch ]; @@ -32,7 +33,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-geolocation" - "--disable-video" # TODO: gsteramer-1.0 "--enable-introspection" ]; @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 wayland libwebp enchant libxml2 libsecret libxslt harfbuzz + gst-plugins-base ]; propagatedBuildInputs = [ gtk3 libsoup ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f7de5e46735..05fec2521086 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5703,6 +5703,7 @@ let harfbuzz = harfbuzz.override { withIcu = true; }; + gst-plugins-base = gst_all_1.gst-plugins-base; }; wildmidi = callPackage ../development/libraries/wildmidi { }; |