From ce597e1e1b6d1a59b10e39bb1fa16979ff0d1bf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 17 Jul 2015 18:22:27 +0200 Subject: [PATCH] updating tor to 0.2.6.10 I checked the tarball signature. I fixed the optimised build (broken since 2013) and I added seccomp. --- pkgs/tools/security/tor/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index bfa1a0ab9f4d..525259bdb029 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchurl, libevent, openssl, zlib, torsocks }: +{ stdenv, fetchurl, libevent, openssl, zlib, torsocks, libseccomp }: stdenv.mkDerivation rec { - name = "tor-0.2.6.9"; + name = "tor-0.2.6.10"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz"; - sha256 = "171gjhapymfzql3bbx5qndgkamcfdl6lincrqlr7i3d9i6njjv2a"; + sha256 = "0542c0efe43b86619337862fa7eb02c7a74cb23a79d587090628a5f0f1224b8d"; }; # Note: torsocks is specified as a dependency, as the distributed # 'torify' wrapper attempts to use it; although there is no # ./configure time check for any of this. - buildInputs = [ libevent openssl zlib torsocks ]; + buildInputs = [ libevent openssl zlib torsocks libseccomp ]; - CFLAGS = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s"; + NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s"; # Patch 'torify' to point directly to torsocks. patchPhase = ''