about summary refs log tree commit diff
path: root/pkgs/os-specific/linux/sysdig/default.nix
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2023-02-23 18:01:15 +0000
committerGitHub <noreply@github.com>2023-02-23 18:01:15 +0000
commit4688cd53b60d045633225e628d37f64105fb81ff (patch)
tree1b343637fd47334ad548cd6e46a60ffdd89fbaab /pkgs/os-specific/linux/sysdig/default.nix
parent52c286ee5b3b8f5c521b17411782311a313f2e4c (diff)
parent7ce8e7c4cf90492a631e96bcfe70724104914381 (diff)
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific/linux/sysdig/default.nix')
-rw-r--r--pkgs/os-specific/linux/sysdig/default.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index a05557468bd29..72a148c26e7c9 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -22,6 +22,11 @@ let
     rev = "3.0.1+driver";
     sha256 = "sha256-bK9wv17bVl93rOqw7JICnMOM0fDtPIErfMmUmNKOD5c=";
   };
+  # Workaround for scap-driver compilation error on kernel 6.2: https://github.com/falcosecurity/libs/issues/918
+  driverPatch = fetchpatch {
+    url = "https://github.com/falcosecurity/libs/commit/b8ec3e8637c850066d01543616fe413e8deb9e1f.patch";
+    hash = "sha256-s7iHbOjVqHSWRY4gktZldgrU5OClqRmbqmDtUgFIeh0=";
+  };
 
 in
 stdenv.mkDerivation rec {
@@ -67,6 +72,7 @@ stdenv.mkDerivation rec {
     chmod -R +w libs
     cp -r ${driver} driver-src
     chmod -R +w driver-src
+    patch -p1 -d driver-src < ${driverPatch}
     cmakeFlagsArray+=(
       "-DFALCOSECURITY_LIBS_SOURCE_DIR=$(pwd)/libs"
       "-DVALIJSON_INCLUDE=${valijson}/include"