diff options
| author | Peter Simons <simons@cryp.to> | 2014-12-30 11:01:02 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2014-12-30 11:01:02 +0100 |
| commit | 6f724d8e228d366e793d038c1881a91f529feb44 (patch) | |
| tree | c19ad0fdc67ef3966f0a6402dc324c5251bf2eb7 | |
| parent | 6222093eecf1f314f82deafa3162c2ad923e66d3 (diff) | |
| parent | a268b0e1c8f9554150e24a8395cf5e229013b23b (diff) | |
| download | nixlib-6f724d8e228d366e793d038c1881a91f529feb44.tar nixlib-6f724d8e228d366e793d038c1881a91f529feb44.tar.gz nixlib-6f724d8e228d366e793d038c1881a91f529feb44.tar.bz2 nixlib-6f724d8e228d366e793d038c1881a91f529feb44.tar.lz nixlib-6f724d8e228d366e793d038c1881a91f529feb44.tar.xz nixlib-6f724d8e228d366e793d038c1881a91f529feb44.tar.zst nixlib-6f724d8e228d366e793d038c1881a91f529feb44.zip | |
Merge pull request #5501 from k0ral/webkitgtk
webkitgtk: 2.6.2 -> 2.6.4
| -rw-r--r-- | pkgs/development/libraries/webkitgtk/default.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 3cbf36987323..9f56d2006472 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -2,14 +2,18 @@ , pkgconfig, gettext, gobjectIntrospection , gtk2, gtk3, wayland, libwebp, enchant , libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs +, enableGeoLocation ? true, geoclue2 , gst-plugins-base }: +assert enableGeoLocation -> geoclue2 != null; + +with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.6.2"; + version = "2.6.4"; - meta = with stdenv.lib; { + meta = { description = "Web content rendering engine, GTK+ port"; homepage = "http://webkitgtk.org/"; license = licenses.bsd2; @@ -21,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "1f9qm5g1mbjm2hrnlzymas99piws4h4y3yxz4p6f6gavnsvfjwji"; + sha256 = "16rffxkz4w3sd7w4j3z3dycny8sdqxrz62yq4bgcmffrxlj5xvxy"; }; patches = [ ./finding-harfbuzz-icu.patch ]; @@ -37,7 +41,7 @@ stdenv.mkDerivation rec { gtk2 wayland libwebp enchant libxml2 libsecret libxslt harfbuzz libpthreadstubs gst-plugins-base - ]; + ] ++ optional enableGeoLocation geoclue2; propagatedBuildInputs = [ libsoup gtk3 |