diff options
| author | Drew Hess <src@drewhess.com> | 2018-01-14 20:19:49 -0800 |
|---|---|---|
| committer | adisbladis <adis@blad.is> | 2018-01-16 15:58:14 +0800 |
| commit | fa3d1c5dfbc48b822661c67b69508765b51003fe (patch) | |
| tree | d032a44d8c41a8574daba3e0aadda0ae3489d2b8 /pkgs/tools/networking/netsniff-ng | |
| parent | 7e0402632d35817bd567da0909439176115a8cf3 (diff) | |
netsniff-ng: 0.6.2 -> 0.6.3
Diffstat (limited to 'pkgs/tools/networking/netsniff-ng')
| -rw-r--r-- | pkgs/tools/networking/netsniff-ng/default.nix | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index b0921375849..6619d0a0f69 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -1,24 +1,24 @@ -{ stdenv, fetchFromGitHub, bison, flex, geoip, geolite-legacy, libcli, libnet -, libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl -, pkgconfig, zlib }: +{ stdenv, fetchFromGitHub, makeWrapper, bison, flex, geoip, geolite-legacy +, libcli, libnet, libnetfilter_conntrack, libnl, libpcap, libsodium +, liburcu, ncurses, perl, pkgconfig, zlib }: stdenv.mkDerivation rec { name = "netsniff-ng-${version}"; - version = "0.6.2"; + version = "0.6.3"; # Upstream recommends and supports git src = fetchFromGitHub rec { repo = "netsniff-ng"; owner = repo; rev = "v${version}"; - sha256 = "1lz4hwgwdq3znlqjmvl7cw3g3ilbayn608h0hwqdf7v2jq6n67kg"; + sha256 = "0g3105c5ha897bpwsnrp72gx4n61gspxmld594i37g8k7vwzny4l"; }; patches = [ ./glibc-2.26.patch ]; buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl libnetfilter_conntrack libpcap libsodium liburcu ncurses perl - pkgconfig zlib ]; + pkgconfig zlib makeWrapper ]; # ./configure is not autoGNU but some home-brewn magic configurePhase = '' @@ -33,6 +33,10 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" ]; postInstall = '' + # trafgen and bpfc can call out to cpp to process config files. + wrapProgram "$out/sbin/trafgen" --prefix PATH ":" "${stdenv.cc}/bin" + wrapProgram "$out/sbin/bpfc" --prefix PATH ":" "${stdenv.cc}/bin" + ln -sv ${geolite-legacy}/share/GeoIP/GeoIP.dat $out/etc/netsniff-ng/country4.dat ln -sv ${geolite-legacy}/share/GeoIP/GeoIPv6.dat $out/etc/netsniff-ng/country6.dat ln -sv ${geolite-legacy}/share/GeoIP/GeoIPCity.dat $out/etc/netsniff-ng/city4.dat |