From c44a41c73f15e7bf834a424d84ce23382c2e7bc4 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 2 Mar 2017 03:09:27 +0100 Subject: [PATCH] tor: split out geoip data Saves about 5.2 MiB. To use geoip, add something like ``` GeoIPFile ${tor.geoip}/share/tor/geoip GeoIPv6File ${tor.geoip}/share/tor/geoip6 ``` to torrc --- pkgs/tools/security/tor/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 25f80a16fea..8128b58155c 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0h8kpn42mgpkzmnga143hi8nh0ai65ypxh7qhkwbb15j3wz2h4fn"; }; + outputs = [ "out" "geoip" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libevent openssl zlib ] ++ stdenv.lib.optionals stdenv.isLinux [ libseccomp systemd libcap ]; @@ -22,6 +24,12 @@ stdenv.mkDerivation rec { --replace 'exec torsocks' 'exec ${torsocks}/bin/torsocks' ''; + postInstall = '' + mkdir -p $geoip/share/tor + mv $out/share/tor/geoip{,6} $geoip/share/tor + rm -rf $out/share/tor + ''; + doCheck = true; meta = with stdenv.lib; {