mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-09 19:13:26 +03:00
suricata: switch from hyperscan to vectorscan
See https://github.com/NixOS/nixpkgs/issues/310772 for context. We can now also build with hyperscan support on ARM64.
This commit is contained in:
parent
eb2376c333
commit
0beba4e076
1 changed files with 4 additions and 7 deletions
|
@ -8,7 +8,6 @@
|
|||
makeWrapper,
|
||||
elfutils,
|
||||
file,
|
||||
hyperscan,
|
||||
jansson,
|
||||
libbpf_0,
|
||||
libcap_ng,
|
||||
|
@ -25,6 +24,7 @@
|
|||
nspr,
|
||||
pcre2,
|
||||
python3,
|
||||
vectorscan,
|
||||
zlib,
|
||||
redisSupport ? true,
|
||||
valkey,
|
||||
|
@ -36,7 +36,6 @@
|
|||
}:
|
||||
let
|
||||
libmagic = file;
|
||||
hyperscanSupport = stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "suricata";
|
||||
|
@ -83,9 +82,9 @@ stdenv.mkDerivation rec {
|
|||
nspr
|
||||
pcre2
|
||||
python3
|
||||
vectorscan
|
||||
zlib
|
||||
]
|
||||
++ lib.optional hyperscanSupport hyperscan
|
||||
++ lib.optionals redisSupport [
|
||||
valkey
|
||||
hiredis
|
||||
|
@ -121,13 +120,11 @@ stdenv.mkDerivation rec {
|
|||
"--enable-unix-socket"
|
||||
"--localstatedir=/var"
|
||||
"--sysconfdir=/etc"
|
||||
"--with-libhs-includes=${lib.getDev vectorscan}/include/hs"
|
||||
"--with-libhs-libraries=${lib.getLib vectorscan}/lib"
|
||||
"--with-libnet-includes=${libnet}/include"
|
||||
"--with-libnet-libraries=${libnet}/lib"
|
||||
]
|
||||
++ lib.optionals hyperscanSupport [
|
||||
"--with-libhs-includes=${hyperscan.dev}/include/hs"
|
||||
"--with-libhs-libraries=${hyperscan}/lib"
|
||||
]
|
||||
++ lib.optional redisSupport "--enable-hiredis"
|
||||
++ lib.optionals rustSupport [
|
||||
"--enable-rust"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue