ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 14:22:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5501 from k0ral/webkitgtk

Browse Source 
webkitgtk: 2.6.2 -> 2.6.4
This commit is contained in:
Peter Simons 2014-12-30 11:01:02 +01:00
commit 6f724d8e22
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,14 +2,18 @@
, pkgconfig, gettext, gobjectIntrospection , pkgconfig, gettext, gobjectIntrospection
, 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
, gst-plugins-base , gst-plugins-base
}: }:
assert enableGeoLocation -> geoclue2 != null;
with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "webkitgtk-${version}"; name = "webkitgtk-${version}";
version = "2.6.2"; version = "2.6.4";
meta = with stdenv.lib; { meta = {
description = "Web content rendering engine, GTK+ port"; description = "Web content rendering engine, GTK+ port";
homepage = "http://webkitgtk.org/"; homepage = "http://webkitgtk.org/";
license = licenses.bsd2; license = licenses.bsd2;
@ -21,7 +25,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "http://webkitgtk.org/releases/${name}.tar.xz"; url = "http://webkitgtk.org/releases/${name}.tar.xz";
sha256 = "1f9qm5g1mbjm2hrnlzymas99piws4h4y3yxz4p6f6gavnsvfjwji"; sha256 = "16rffxkz4w3sd7w4j3z3dycny8sdqxrz62yq4bgcmffrxlj5xvxy";
}; };
patches = [ ./finding-harfbuzz-icu.patch ]; patches = [ ./finding-harfbuzz-icu.patch ];
@ -37,7 +41,7 @@ stdenv.mkDerivation rec {
gtk2 wayland libwebp enchant gtk2 wayland libwebp enchant
libxml2 libsecret libxslt harfbuzz libpthreadstubs libxml2 libsecret libxslt harfbuzz libpthreadstubs
gst-plugins-base gst-plugins-base
]; ] ++ optional enableGeoLocation geoclue2;
propagatedBuildInputs = [ propagatedBuildInputs = [
libsoup gtk3 libsoup gtk3