diff options
Diffstat (limited to 'pkgs/applications/networking/ids/zeek/default.nix')
| -rw-r--r-- | pkgs/applications/networking/ids/zeek/default.nix | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index 9d1df501369..8fe856f9773 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -1,25 +1,35 @@ {stdenv, fetchurl, cmake, flex, bison, openssl, libpcap, zlib, file, curl -, libmaxminddb, gperftools, python, swig, rocksdb }: +, libmaxminddb, gperftools, python, swig, fetchpatch }: let preConfigure = (import ./script.nix); in stdenv.mkDerivation rec { pname = "zeek"; - version = "3.0.3"; + version = "3.1.2"; src = fetchurl { - url = "https://old.zeek.org/downloads/zeek-${version}.tar.gz"; - sha256 = "0xlw5v83qbgy23wdcddmvan2pid28mw745g4fc1z5r18kp67i8a2"; + url = "https://download.zeek.org/zeek-${version}.tar.gz"; + sha256 = "18aa4pfwav8m6vq7cr4bhfg243da54ak933rqbriljnhsrgp4n0q"; }; nativeBuildInputs = [ cmake flex bison file ]; - buildInputs = [ openssl libpcap zlib curl libmaxminddb gperftools python swig rocksdb ]; + buildInputs = [ openssl libpcap zlib curl libmaxminddb gperftools python swig ]; #see issue https://github.com/zeek/zeek/issues/804 to modify hardlinking duplicate files. inherit preConfigure; - + enableParallelBuilding = true; + patches = stdenv.lib.optionals stdenv.cc.isClang [ + # Fix pybind c++17 build with Clang. See: https://github.com/pybind/pybind11/issues/1604 + (fetchpatch { + url = "https://github.com/pybind/pybind11/commit/759221f5c56939f59d8f342a41f8e2d2cacbc8cf.patch"; + sha256 = "0l8z7d7chq1awd8dnfarj4c40wx36hkhcan0702p5l89x73wqk54"; + extraPrefix = "aux/broker/bindings/python/3rdparty/pybind11/"; + stripLen = 1; + }) + ]; + cmakeFlags = [ "-DPY_MOD_INSTALL_DIR=${placeholder "out"}/${python.sitePackages}" "-DENABLE_PERFTOOLS=true" |