Commit 6f724d8e authored by Peter Simons's avatar Peter Simons
Browse files

Merge pull request #5501 from k0ral/webkitgtk 

webkitgtk: 2.6.2 -> 2.6.4
parents 6222093e a268b0e1

pkgs/development/libraries/webkitgtk/default.nix

+8 −4
Original line number Diff line number Diff line
@@ -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