From 9353d8c1ea1e66ca5de955c1926a966f39b30ca3 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 4 Dec 2016 18:16:18 +0100
Subject: [PATCH 1/4] torsocks: 2.1.0 -> 2.2.0

---
 pkgs/tools/security/tor/torsocks.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix
index ee4749683a5..9577bc4144f 100644
--- a/pkgs/tools/security/tor/torsocks.nix
+++ b/pkgs/tools/security/tor/torsocks.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "torsocks-${version}";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchgit {
     url    = meta.repositories.git;
     rev    = "refs/tags/v${version}";
-    sha256 = "1l890pg0h2hqpkabsnwc6pq2qi8mfv58qzaaicc9y62rq5nmrrws";
+    sha256 = "1xwkmfaxhhnbmvp37agnby1n53hznwhvx0dg1hj35467qfx985zc";
   };
 
   buildInputs = [ autoreconfHook ];

From 8aebb6b18107a31798f13eb793b7ca4129062580 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 4 Dec 2016 18:23:02 +0100
Subject: [PATCH 2/4] torsocks: expression cleanups

- Remove redundant preConfigure
  torsocks installs into $libdir/torsocks, so setting libdir=$out/lib
  doesn't really help.  To put the shared objects into $out/lib we'd have
  to manually move them into $out and patch various files (the script
  itself expects $libdir/torsocks).
- Use nativeBuildInputs
---
 pkgs/tools/security/tor/torsocks.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix
index 9577bc4144f..01d426b2702 100644
--- a/pkgs/tools/security/tor/torsocks.nix
+++ b/pkgs/tools/security/tor/torsocks.nix
@@ -10,10 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1xwkmfaxhhnbmvp37agnby1n53hznwhvx0dg1hj35467qfx985zc";
   };
 
-  buildInputs = [ autoreconfHook ];
-  preConfigure = ''
-      export configureFlags="$configureFlags --libdir=$out/lib"
-  '';
+  nativeBuildInputs = [ autoreconfHook ];
 
   patchPhase = ''
     substituteInPlace src/bin/torsocks.in \

From 95608c3e8d222e19f57b1ec7924476529ff0ee2c Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 4 Dec 2016 18:58:12 +0100
Subject: [PATCH 3/4] torsocks: redo patching, ensure getcap is available

---
 pkgs/tools/security/tor/torsocks.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix
index 01d426b2702..a28d477d3f8 100644
--- a/pkgs/tools/security/tor/torsocks.nix
+++ b/pkgs/tools/security/tor/torsocks.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, autoreconfHook, which }:
+{ stdenv, fetchgit, autoreconfHook, libcap }:
 
 stdenv.mkDerivation rec {
   name = "torsocks-${version}";
@@ -12,9 +12,12 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  patchPhase = ''
-    substituteInPlace src/bin/torsocks.in \
-      --replace which ${which}/bin/which
+  postPatch = ''
+    # Patch torify_app()
+    sed -i \
+      -e 's,\(local app_path\)=`which $1`,\1=`type -P $1`,' \
+      -e 's,\(local getcap\)=.*,\1=${libcap}/bin/getcap,' \
+      src/bin/torsocks.in
   '';
 
   meta = {

From 07c0cdcba279be30faf8b1fd4443b274d3785f90 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 4 Dec 2016 19:31:27 +0100
Subject: [PATCH 4/4] torsocks: enable install check

---
 pkgs/tools/security/tor/torsocks.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix
index a28d477d3f8..466dc4b4e46 100644
--- a/pkgs/tools/security/tor/torsocks.nix
+++ b/pkgs/tools/security/tor/torsocks.nix
@@ -20,6 +20,9 @@ stdenv.mkDerivation rec {
       src/bin/torsocks.in
   '';
 
+  doInstallCheck = true;
+  installCheckTarget = "check-recursive";
+
   meta = {
     description      = "Wrapper to safely torify applications";
     homepage         = http://code.google.com/p/torsocks/;