diff options
author | Anthony Cowley <acowley@gmail.com> | 2016-05-11 19:33:08 -0400 |
---|---|---|
committer | Anthony Cowley <acowley@gmail.com> | 2016-05-11 19:33:08 -0400 |
commit | 86c3444e033c4ebdd5cc60601af70b2fd759fed4 (patch) | |
tree | 391e0cb8cfd14a66da8aa06118c1f132d30d7a4a /pkgs/tools/networking/ntopng | |
parent | 33449c54dd68b36f73d6ace90f68ca8f6eaf4d89 (diff) |
ntopng: prefer nixpkgs over in-tree deps
I've also added darwin compatibility.
Diffstat (limited to 'pkgs/tools/networking/ntopng')
-rw-r--r-- | pkgs/tools/networking/ntopng/default.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix index c17c33af17ed6..d1a90d9d1aad1 100644 --- a/pkgs/tools/networking/ntopng/default.nix +++ b/pkgs/tools/networking/ntopng/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, libpcap,/* gnutls, libgcrypt,*/ libxml2, glib , geoip, geolite-legacy, sqlite, which, autoreconfHook, git -, pkgconfig, groff, curl, json_c +, pkgconfig, groff, curl, json_c, luajit, zeromq, rrdtool }: # ntopng includes LuaJIT, mongoose, rrdtool and zeromq in its third-party/ -# directory. +# directory, but we use luajit, zeromq, and rrdtool from nixpkgs stdenv.mkDerivation rec { name = "ntopng-2.0"; @@ -23,7 +23,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ libpcap/* gnutls libgcrypt*/ libxml2 glib geoip geolite-legacy - sqlite which autoreconfHook git pkgconfig groff curl json_c ]; + sqlite which autoreconfHook git pkgconfig groff curl json_c luajit zeromq + rrdtool ]; autoreconfPhase = '' @@ -48,13 +49,15 @@ stdenv.mkDerivation rec { rm -rf httpdocs/geoip ln -s ${geolite-legacy}/share/GeoIP httpdocs/geoip + '' + stdenv.lib.optionalString stdenv.isDarwin '' + sed 's|LIBS += -lstdc++.6||' -i Makefile ''; meta = with stdenv.lib; { description = "High-speed web-based traffic analysis and flow collection tool"; homepage = http://www.ntop.org/products/ntop/; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; }; } |