From 78ec3797ab607901c30e194d60f308c0b8e5013f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 6 Mar 2015 17:41:59 +0100 Subject: [PATCH] netsniff-ng: remove useless dependencies - Replace external `which` with `command -v` built into bash - Remove non-functional GeoIP dependency for now --- pkgs/tools/networking/netsniff-ng/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index e9a0157b123..f192e8dba15 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 +{ stdenv, fetchFromGitHub, bison, flex, libcli, libnet , libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl -, pkgconfig, which, zlib }: +, pkgconfig, zlib }: stdenv.mkDerivation rec { version = "0.5.9-rc4-40-g5107740"; @@ -13,12 +13,13 @@ stdenv.mkDerivation rec { sha256 = "1z3b7pa5rhz37dhfb1riy1j9lg917bs4z7clqbxm1hzi1x2ln988"; }; - buildInputs = [ bison flex geoip libcli libnet libnl libnetfilter_conntrack - libpcap libsodium liburcu ncurses perl pkgconfig which zlib ]; + buildInputs = [ bison flex libcli libnet libnl libnetfilter_conntrack + libpcap libsodium liburcu ncurses perl pkgconfig zlib ]; # ./configure is not autoGNU but some home-brewn magic configurePhase = '' patchShebangs configure + substituteInPlace configure --replace "which" "command -v" NACL_INC_DIR=${libsodium}/include/sodium NACL_LIB=sodium ./configure '';