From 3070630aa7bc0a51fd801036ff94b72544c37de7 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Mon, 29 Dec 2014 11:32:33 +0100
Subject: [PATCH 1/2] webkitgtk: 2.6.2 -> 2.6.4

---
 pkgs/development/libraries/webkitgtk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index 3cbf36987323..9515ff223899 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
   name = "webkitgtk-${version}";
-  version = "2.6.2";
+  version = "2.6.4";
 
   meta = with stdenv.lib; {
     description = "Web content rendering engine, GTK+ port";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "1f9qm5g1mbjm2hrnlzymas99piws4h4y3yxz4p6f6gavnsvfjwji";
+    sha256 = "16rffxkz4w3sd7w4j3z3dycny8sdqxrz62yq4bgcmffrxlj5xvxy";
   };
 
   patches = [ ./finding-harfbuzz-icu.patch ];

From a268b0e1c8f9554150e24a8395cf5e229013b23b Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Mon, 29 Dec 2014 12:23:32 +0100
Subject: [PATCH 2/2] webkitgtk: added optional geoclue2 dependency.

---
 pkgs/development/libraries/webkitgtk/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index 9515ff223899..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.4";
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "Web content rendering engine, GTK+ port";
     homepage = "http://webkitgtk.org/";
     license = licenses.bsd2;
@@ -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