movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 19:55:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

suricata: switch from hyperscan to vectorscan (#402330)

Browse source
This commit is contained in:
Florian Klink 2025-04-29 10:09:08 +03:00 • committed by GitHub
commit 0344f99dd4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
pkgs/by-name/su/suricata/package.nix
View file

@ -8,7 +8,6 @@
makeWrapper, makeWrapper,
elfutils, elfutils,
file, file,
hyperscan,
jansson, jansson,
libbpf_0, libbpf_0,
libcap_ng, libcap_ng,
@ -25,6 +24,7 @@
nspr, nspr,
pcre2, pcre2,
python3, python3,
vectorscan,
zlib, zlib,
redisSupport ? true, redisSupport ? true,
valkey, valkey,
@ -36,7 +36,6 @@
}: }:
let let
libmagic = file; libmagic = file;
hyperscanSupport = stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "suricata"; pname = "suricata";
@ -83,9 +82,9 @@ stdenv.mkDerivation rec {
nspr nspr
pcre2 pcre2
python3 python3
vectorscan
zlib zlib
] ]
++ lib.optional hyperscanSupport hyperscan
++ lib.optionals redisSupport [ ++ lib.optionals redisSupport [
valkey valkey
hiredis hiredis
@ -121,13 +120,11 @@ stdenv.mkDerivation rec {
"--enable-unix-socket" "--enable-unix-socket"
"--localstatedir=/var" "--localstatedir=/var"
"--sysconfdir=/etc" "--sysconfdir=/etc"
"--with-libhs-includes=${lib.getDev vectorscan}/include/hs"
"--with-libhs-libraries=${lib.getLib vectorscan}/lib"
"--with-libnet-includes=${libnet}/include" "--with-libnet-includes=${libnet}/include"
"--with-libnet-libraries=${libnet}/lib" "--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.optional redisSupport "--enable-hiredis"
++ lib.optionals rustSupport [ ++ lib.optionals rustSupport [
"--enable-rust" "--enable-rust"