public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

webkitgtk: 2.8.5 -> 2.10.0

Browse Source
This commit is contained in:
Luca Bruno 2015-09-25 10:28:51 +02:00
parent 697d61ceab
commit b1f4a7ef32
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/webkitgtk/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, perl, python, ruby, bison, gperf, cmake { stdenv, fetchurl, perl, python, ruby, bison, gperf, cmake
, pkgconfig, gettext, gobjectIntrospection , pkgconfig, gettext, gobjectIntrospection, libnotify
, gtk2, gtk3, wayland, libwebp, enchant , gtk2, gtk3, wayland, libwebp, enchant
, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs , libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs
, enableGeoLocation ? true, geoclue2, sqlite , enableGeoLocation ? true, geoclue2, sqlite
@ -11,7 +11,7 @@ assert enableGeoLocation -> geoclue2 != null;
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "webkitgtk-${version}"; name = "webkitgtk-${version}";
version = "2.8.5"; version = "2.10.0";
meta = { meta = {
description = "Web content rendering engine, GTK+ port"; description = "Web content rendering engine, GTK+ port";
@ -25,12 +25,12 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "http://webkitgtk.org/releases/${name}.tar.xz"; url = "http://webkitgtk.org/releases/${name}.tar.xz";
sha256 = "082dw0d8jxvsapx30ypmy5h2srzfzi42c3zr9pbkzx1m959hq7rx"; sha256 = "0vb8ca6dd9hxb5ycp54bdyykp10blbq5b6qkbak4yf9mxwi5ccj2";
}; };
patches = [ ./finding-harfbuzz-icu.patch ]; patches = [ ./finding-harfbuzz-icu.patch ];
cmakeFlags = [ "-DPORT=GTK" ]; cmakeFlags = [ "-DPORT=GTK" "-DUSE_LIBHYPHEN=0" ];
# XXX: WebKit2 missing include path for gst-plugins-base. # XXX: WebKit2 missing include path for gst-plugins-base.
# Filled: https://bugs.webkit.org/show_bug.cgi?id=148894 # Filled: https://bugs.webkit.org/show_bug.cgi?id=148894
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
gtk2 wayland libwebp enchant gtk2 wayland libwebp enchant libnotify
libxml2 libsecret libxslt harfbuzz libpthreadstubs libxml2 libsecret libxslt harfbuzz libpthreadstubs
gst-plugins-base gst-plugins-base
] ++ optional enableGeoLocation geoclue2; ] ++ optional enableGeoLocation geoclue2;
@ -51,5 +51,5 @@ stdenv.mkDerivation rec {
libsoup gtk3 libsoup gtk3
]; ];
enableParallelBuilding = true; # build problems on Hydra enableParallelBuilding = true;
} }