From ad5cd5a0a001807dba7c641dc8dac527d23a5de2 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Sun, 28 Jul 2024 00:48:06 +0530 Subject: [PATCH] ananicy-cpp: make bpf support optional ananicy-cpp compiled with bpf does not work on hardened kernels So we make it optional to allow users to disable it https://github.com/NixOS/nixpkgs/issues/327382 --- pkgs/by-name/an/ananicy-cpp/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/an/ananicy-cpp/package.nix b/pkgs/by-name/an/ananicy-cpp/package.nix index cd9f052c650c..e34bebff8f26 100644 --- a/pkgs/by-name/an/ananicy-cpp/package.nix +++ b/pkgs/by-name/an/ananicy-cpp/package.nix @@ -13,6 +13,7 @@ bpftools, pcre2, zlib, + withBpf ? true, }: clangStdenv.mkDerivation (finalAttrs: { @@ -42,6 +43,7 @@ clangStdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config + ] ++ lib.optionals withBpf [ bpftools ]; @@ -50,9 +52,10 @@ clangStdenv.mkDerivation (finalAttrs: { spdlog nlohmann_json systemd + zlib + ] ++ lib.optionals withBpf [ libbpf elfutils - zlib ]; # BPF A call to built-in function '__stack_chk_fail' is not supported. @@ -66,7 +69,7 @@ clangStdenv.mkDerivation (finalAttrs: { "USE_EXTERNAL_JSON" = true; "USE_EXTERNAL_SPDLOG" = true; "USE_EXTERNAL_FMTLIB" = true; - "USE_BPF_PROC_IMPL" = true; + "USE_BPF_PROC_IMPL" = withBpf; "BPF_BUILD_LIBBPF" = false; "ENABLE_SYSTEMD" = true; "ENABLE_REGEX_SUPPORT" = true;