diff options
| author | Edward Tjörnhammar <ed@cflags.cc> | 2016-04-27 17:59:08 +0200 |
|---|---|---|
| committer | Edward Tjörnhammar <ed@cflags.cc> | 2016-04-27 18:02:06 +0200 |
| commit | 2b384d401d5cd2a33be4261fc05d1684ebe02be6 (patch) | |
| tree | bd210580830920cf274d5c4b980883643fbca57e /pkgs | |
| parent | 0307ab1f3743cc0bc0c4a0439dcd5df0c68f8605 (diff) | |
| download | nixpkgs-2b384d401d5cd2a33be4261fc05d1684ebe02be6.tar nixpkgs-2b384d401d5cd2a33be4261fc05d1684ebe02be6.tar.gz nixpkgs-2b384d401d5cd2a33be4261fc05d1684ebe02be6.tar.bz2 nixpkgs-2b384d401d5cd2a33be4261fc05d1684ebe02be6.tar.lz nixpkgs-2b384d401d5cd2a33be4261fc05d1684ebe02be6.tar.xz nixpkgs-2b384d401d5cd2a33be4261fc05d1684ebe02be6.tar.zst nixpkgs-2b384d401d5cd2a33be4261fc05d1684ebe02be6.zip | |
tsocks: switch back to regular stdenv libc, remove saveme compilation
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/tsocks/default.nix | 13 | ||||
| -rw-r--r-- | 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 778762f1bf8..149b2260792 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 cd576d1bea0..9c6c9540da6 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 { }; |