From 8aebb6b18107a31798f13eb793b7ca4129062580 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 4 Dec 2016 18:23:02 +0100 Subject: [PATCH] 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 9577bc4144f0..01d426b2702a 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 \