tsocks: switch back to regular stdenv libc, remove saveme compilation

+12 -7
+11 -2
pkgs/development/libraries/tsocks/default.nix
··· 1 1 { stdenv, fetchurl }: 2 + 2 3 stdenv.mkDerivation rec { 3 4 name = "tsocks-${version}"; 4 5 version = "1.8beta5"; ··· 16 17 export configureFlags="$configureFlags --libdir=$out/lib" 17 18 ''; 18 19 20 + preBuild = '' 21 + # We don't need the saveme binary, it is in fact never stored and we're 22 + # never injecting stuff into ld.so.preload anyway 23 + sed -i \ 24 + -e "s,TARGETS=\(.*\)..SAVE.\(.*\),TARGETS=\1\2," \ 25 + -e "/SAVE/d" Makefile 26 + ''; 27 + 19 28 meta = with stdenv.lib; { 20 29 description = "Transparent SOCKS v4 proxying library"; 21 30 homepage = http://tsocks.sourceforge.net/; 22 31 license = stdenv.lib.licenses.gpl2; 23 32 maintainers = with maintainers; [ edwtjo phreedom ]; 24 - platforms = platforms.linux; 33 + platforms = platforms.unix; 25 34 }; 26 - } 35 + }
+1 -5
pkgs/top-level/all-packages.nix
··· 8979 8979 8980 8980 unicap = callPackage ../development/libraries/unicap {}; 8981 8981 8982 - tsocks = callPackage ../development/libraries/tsocks { 8983 - stdenv = overrideCC stdenv ( 8984 - wrapCCWith (callPackage ../build-support/cc-wrapper) 8985 - musl "" gcc.cc); 8986 - }; 8982 + tsocks = callPackage ../development/libraries/tsocks { }; 8987 8983 8988 8984 unixODBC = callPackage ../development/libraries/unixODBC { }; 8989 8985