From be989567c88600b7f9af16496485a17ea6c965d0 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 15 Jan 2013 07:13:30 +0200 Subject: [PATCH] Torsocks is not compatible with certain apps like Kopete. Will integrate both in NixOS. Revert "removing tsocks as it has been replaced by torsocks." This reverts commit f947527f184446572ad3e36c4423b23e797aeb5a. --- pkgs/development/libraries/tsocks/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/tsocks/default.nix diff --git a/pkgs/development/libraries/tsocks/default.nix b/pkgs/development/libraries/tsocks/default.nix new file mode 100644 index 000000000000..a0d607517ac3 --- /dev/null +++ b/pkgs/development/libraries/tsocks/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl }: +stdenv.mkDerivation rec { + name = "tsocks-${version}"; + version = "1.8beta5"; + + src = fetchurl { + url = "mirror://sourceforge/tsocks/${name}.tar.gz"; + sha256 = "0ixkymiph771dcdzvssi9dr2pk1bzaw9zv85riv3xl40mzspx7c4"; + }; + + preConfigure = '' + export configureFlags="$configureFlags --libdir=$out/lib" + ''; + + meta = with stdenv.lib; { + description = "Transparent SOCKS v4 proxying library"; + homepage = http://tsocks.sourceforge.net/; + license = "GPLv2"; + maintainers = [ maintainers.phreedom ]; + platforms = platforms.linux; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f5b7409a0155..f7e84af2332d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5033,6 +5033,8 @@ let unicap = callPackage ../development/libraries/unicap {}; + tsocks = callPackage ../development/libraries/tsocks { }; + unixODBC = callPackage ../development/libraries/unixODBC { }; unixODBCDrivers = recurseIntoAttrs (import ../development/libraries/unixODBCDrivers {