webkitgtk: 2.22.7 -> 2.24.0

This commit is contained in:
Herwig Hochleitner 2019-03-13 21:08:39 +01:00
parent bc9a42e07a
commit a72bb46155

View File

@ -2,7 +2,7 @@
, pkgconfig, gettext, gobject-introspection, libnotify, gnutls, libgcrypt , pkgconfig, gettext, gobject-introspection, libnotify, gnutls, libgcrypt
, gtk3, wayland, libwebp, enchant2, xorg, libxkbcommon, epoxy, at-spi2-core , gtk3, wayland, libwebp, enchant2, xorg, libxkbcommon, epoxy, at-spi2-core
, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11-kit , libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11-kit
, libidn, libedit, readline, libGLU_combined, libintl , libidn, libedit, readline, libGLU_combined, libintl, openjpeg
, enableGeoLocation ? true, geoclue2, sqlite , enableGeoLocation ? true, geoclue2, sqlite
, enableGtk2Plugins ? false, gtk2 ? null , enableGtk2Plugins ? false, gtk2 ? null
, gst-plugins-base, gst-plugins-bad, woff2 , gst-plugins-base, gst-plugins-bad, woff2
@ -15,7 +15,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins;
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "webkitgtk-${version}"; name = "webkitgtk-${version}";
version = "2.22.7"; version = "2.24.0";
meta = { meta = {
description = "Web content rendering engine, GTK+ port"; description = "Web content rendering engine, GTK+ port";
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://webkitgtk.org/releases/${name}.tar.xz"; url = "https://webkitgtk.org/releases/${name}.tar.xz";
sha256 = "1zrhmz90sn30zgyflj4i86fsscws10xsi2kfs87nj2nd0pbggrjb"; sha256 = "01s446lmjk7y8il4snjm32vpxws2rp4hmxrwm2swx0p47x8d2jif";
}; };
patches = optionals stdenv.isDarwin [ patches = optionals stdenv.isDarwin [
@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
libintl libwebp enchant2 libnotify gnutls pcre nettle libidn libgcrypt woff2 libintl libwebp enchant2 libnotify gnutls pcre nettle libidn libgcrypt woff2
libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11-kit libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11-kit openjpeg
sqlite gst-plugins-base gst-plugins-bad libxkbcommon epoxy at-spi2-core sqlite gst-plugins-base gst-plugins-bad libxkbcommon epoxy at-spi2-core
] ++ optional enableGeoLocation geoclue2 ] ++ optional enableGeoLocation geoclue2
++ optional enableGtk2Plugins gtk2 ++ optional enableGtk2Plugins gtk2