diff options
author | tobim <tobim+github@fastmail.fm> | 2019-04-14 12:09:22 +0200 |
---|---|---|
committer | markuskowa <markus.kowalewski@gmail.com> | 2019-04-14 12:09:22 +0200 |
commit | 674d7f42c36a17d78a1670ebde4caa766e02aa72 (patch) | |
tree | 702388b7efe8815f20afc8b995511c6c8c9c192e /pkgs/tools/networking/nfdump/default.nix | |
parent | 3f901ea7a44883a98d7c3442efc6fc89adb94f0f (diff) |
nfdump: 1.6.16 -> 1.6.17 (#57306)
* nfdump: 1.6.16 -> 1.6.17
Build system switched to autotools in the new version.
Also enabled the build of a few additional tools.
- Remove unneeded call to patchShebangs
- Add a comment explaining the darwin libtoolize workaround
Diffstat (limited to '')
-rw-r--r-- | pkgs/tools/networking/nfdump/default.nix | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/pkgs/tools/networking/nfdump/default.nix b/pkgs/tools/networking/nfdump/default.nix index 7af852095124..5ad3adfc9153 100644 --- a/pkgs/tools/networking/nfdump/default.nix +++ b/pkgs/tools/networking/nfdump/default.nix @@ -1,19 +1,34 @@ -{ stdenv, fetchFromGitHub, bzip2, yacc, flex }: +{ stdenv, fetchFromGitHub +, autoconf, automake, libtool, pkg-config +, bzip2, libpcap, flex, yacc }: -let version = "1.6.16"; in +let version = "1.6.17"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "nfdump-${version}"; src = fetchFromGitHub { owner = "phaag"; repo = "nfdump"; rev = "v${version}"; - sha256 = "0dgrzf9m4rg5ygibjw21gjdm9am3570wys7wdh5k16nsnyai1gqm"; + sha256 = "1z8zpvd9jfi2raafcbkykw55y0hd4mp74jvna19h3k0g86mqkxya"; }; - nativeBuildInputs = [yacc flex]; - buildInputs = [bzip2]; + nativeBuildInputs = [ autoconf automake flex libtool pkg-config yacc ]; + buildInputs = [ bzip2 libpcap ]; + + preConfigure = '' + # The script defaults to glibtoolize on darwin, so we pass the correct + # name explicitly. + LIBTOOLIZE=libtoolize ./autogen.sh + ''; + + configureFlags = [ + "--enable-nsel" + "--enable-sflow" + "--enable-readpcap" + "--enable-nfpcapd" + ]; meta = with stdenv.lib; { description = "Tools for working with netflow data"; |