public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Edward Tjörnhammar 2016-04-27 17:59:08 +02:00
parent 0307ab1f37
commit 2b384d401d
No known key found for this signature in database
GPG Key ID: 7B82CE4A866B6845
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/tsocks/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl }: { stdenv, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "tsocks-${version}"; name = "tsocks-${version}";
version = "1.8beta5"; version = "1.8beta5";
@ -16,11 +17,19 @@ stdenv.mkDerivation rec {
export configureFlags="$configureFlags --libdir=$out/lib" 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; { meta = with stdenv.lib; {
description = "Transparent SOCKS v4 proxying library"; description = "Transparent SOCKS v4 proxying library";
homepage = http://tsocks.sourceforge.net/; homepage = http://tsocks.sourceforge.net/;
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;
maintainers = with maintainers; [ edwtjo phreedom ]; maintainers = with maintainers; [ edwtjo phreedom ];
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

6
pkgs/top-level/all-packages.nix
View File

@ -8979,11 +8979,7 @@ in
unicap = callPackage ../development/libraries/unicap {}; unicap = callPackage ../development/libraries/unicap {};
tsocks = callPackage ../development/libraries/tsocks { tsocks = callPackage ../development/libraries/tsocks { };
stdenv = overrideCC stdenv (
wrapCCWith (callPackage ../build-support/cc-wrapper)
musl "" gcc.cc);
};
unixODBC = callPackage ../development/libraries/unixODBC { }; unixODBC = callPackage ../development/libraries/unixODBC { };