From 96812d6adc093106bf975555a1a6c092be63f2ca Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 17 Jan 2015 16:46:23 +0100 Subject: netsniff-ng: use libsodium to build curvetun --- pkgs/tools/networking/netsniff-ng/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'pkgs/tools/networking/netsniff-ng') diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index 0c63a32ae164..e9a0157b123c 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, bison, flex, geoip, libcli, libnet -, libnetfilter_conntrack, libnl, libpcap, liburcu, ncurses, perl, pkgconfig -, which, zlib }: +, libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl +, pkgconfig, which, zlib }: stdenv.mkDerivation rec { version = "0.5.9-rc4-40-g5107740"; @@ -13,12 +13,14 @@ stdenv.mkDerivation rec { sha256 = "1z3b7pa5rhz37dhfb1riy1j9lg917bs4z7clqbxm1hzi1x2ln988"; }; - # ./configure is not autoGNU but some home-brewn magic - preConfigure = "patchShebangs configure"; - - # FIXME: add missing nacl to build curvetun buildInputs = [ bison flex geoip libcli libnet libnl libnetfilter_conntrack - libpcap liburcu ncurses perl pkgconfig which zlib ]; + libpcap libsodium liburcu ncurses perl pkgconfig which zlib ]; + + # ./configure is not autoGNU but some home-brewn magic + configurePhase = '' + patchShebangs configure + NACL_INC_DIR=${libsodium}/include/sodium NACL_LIB=sodium ./configure + ''; enableParallelBuilding = true; -- cgit 1.4.1