nixpkgs: torsocks 1.3 -> 2.0.0

Additionally, this fixes 'torsocks' using the 'which' executable as a
dependency.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
This commit is contained in:
Austin Seipp 2014-12-05 22:32:56 -06:00
parent 1ef6470f15
commit d92d0eca92
1 changed files with 18 additions and 12 deletions

View File

@ -1,13 +1,13 @@
{ stdenv, fetchgit, autoreconfHook }: { stdenv, fetchgit, autoreconfHook, which }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "torsocks"; name = "torsocks-${version}";
name = "${pname}-${version}"; version = "2.0.0";
version = "1.3";
src = fetchgit { src = fetchgit {
url = meta.repositories.git; url = meta.repositories.git;
rev = "refs/tags/${version}"; rev = "refs/tags/v${version}";
sha256 = "1cqplb36fkdb81kzf48xlxclf64wnp8r56x1gjayax1h6x4aal1w"; sha256 = "e3868ae8baadce1854cc9e604a5fcfa0433a15e4eb1223cc9da5b3c586db0048";
}; };
buildInputs = [ autoreconfHook ]; buildInputs = [ autoreconfHook ];
@ -15,11 +15,17 @@ stdenv.mkDerivation rec {
export configureFlags="$configureFlags --libdir=$out/lib" export configureFlags="$configureFlags --libdir=$out/lib"
''; '';
patchPhase = ''
substituteInPlace src/bin/torsocks.in \
--replace which ${which}/bin/which
'';
meta = { meta = {
description = "use socks-friendly applications with Tor"; description = "Wrapper to safely torify applications";
homepage = http://code.google.com/p/torsocks/; homepage = http://code.google.com/p/torsocks/;
repositories.git = https://git.torproject.org/torsocks.git; repositories.git = https://git.torproject.org/torsocks.git;
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.phreedom ]; platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ phreedom thoughtpolice ];
}; };
} }