From 2b384d401d5cd2a33be4261fc05d1684ebe02be6 Mon Sep 17 00:00:00 2001
From: Edward Tjörnhammar <ed@cflags.cc>
Date: Wed, 27 Apr 2016 17:59:08 +0200
Subject: tsocks: switch back to regular stdenv libc, remove saveme compilation

---
 pkgs/development/libraries/tsocks/default.nix | 13 +++++++++++--
 pkgs/top-level/all-packages.nix               |  6 +-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/tsocks/default.nix b/pkgs/development/libraries/tsocks/default.nix
index 778762f1bf87b..149b2260792fb 100644
--- a/pkgs/development/libraries/tsocks/default.nix
+++ b/pkgs/development/libraries/tsocks/default.nix
@@ -1,4 +1,5 @@
 { stdenv, fetchurl }:
+
 stdenv.mkDerivation rec {
   name = "tsocks-${version}";
   version = "1.8beta5";
@@ -16,11 +17,19 @@ stdenv.mkDerivation rec {
     export configureFlags="$configureFlags --libdir=$out/lib"
   '';
 
+  preBuild = ''
+    # We don't need the saveme binary, it is in fact never stored and we're
+    # never injecting stuff into ld.so.preload anyway
+    sed -i \
+      -e "s,TARGETS=\(.*\)..SAVE.\(.*\),TARGETS=\1\2," \
+      -e "/SAVE/d" Makefile
+  '';
+
   meta = with stdenv.lib; {
     description = "Transparent SOCKS v4 proxying library";
     homepage = http://tsocks.sourceforge.net/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = with maintainers; [ edwtjo phreedom ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cd576d1bea031..9c6c9540da6cd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8979,11 +8979,7 @@ in
 
   unicap = callPackage ../development/libraries/unicap {};
 
-  tsocks = callPackage ../development/libraries/tsocks {
-    stdenv = overrideCC stdenv (
-      wrapCCWith (callPackage ../build-support/cc-wrapper)
-      musl "" gcc.cc);
-  };
+  tsocks = callPackage ../development/libraries/tsocks { };
 
   unixODBC = callPackage ../development/libraries/unixODBC { };
 
-- 
cgit 1.4.1