From c9e65df9df9de665981916fdbf101937dd0af1db Mon Sep 17 00:00:00 2001 From: Manuel Frischknecht Date: Sun, 26 Nov 2023 12:32:06 +0100 Subject: osquery: add unreleased upstream patch for current Clang version osquery uses vendored boost libraries that still rely on old standard types like `std::unary_function` (deprecated since C++11, removed in C++17) which breaks the build with Clang 16. Upstream already contains a fix [1] that hasn't been released yet. [1]: https://github.com/osquery/osquery/commit/222991a15b4ae0a0fb919e4965603616536e1b0a --- pkgs/tools/system/osquery/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'pkgs/tools/system/osquery') diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix index a7c8f18214fa5..a5d7fa3d44137 100644 --- a/pkgs/tools/system/osquery/default.nix +++ b/pkgs/tools/system/osquery/default.nix @@ -1,6 +1,7 @@ { lib , cmake , fetchFromGitHub +, fetchpatch , git , llvmPackages , nixosTests @@ -32,6 +33,15 @@ buildStdenv.mkDerivation rec { ./Remove-circular-definition-of-AUDIT_FILTER_EXCLUDE.patch # For current state of compilation against glibc in the clangWithLLVM toolchain, refer to the upstream issue in https://github.com/osquery/osquery/issues/7823. ./Remove-system-controls-table.patch + + # osquery uses a vendored boost library that still relies on old standard types (e.g. `std::unary_function`) + # which have been removed as of C++17. The patch is already checked in upstream, but there have been no + # releases yet. Can likely be removed with versions > 5.10.2. + (fetchpatch { + name = "fix-build-on-clang-16.patch"; + url = "https://github.com/osquery/osquery/commit/222991a15b4ae0a0fb919e4965603616536e1b0a.patch"; + hash = "sha256-PdzEoeR1LXVri1Cd+7KMhKmDC8yZhAx3f1+9tjLJKyo="; + }) ]; -- cgit 1.4.1