diff options
author | 7c6f434c <7c6f434c@mail.ru> | 2023-02-23 14:58:00 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-23 14:58:00 +0000 |
commit | 0251d3abea7742f8f2050f135c266c979bd913c3 (patch) | |
tree | d4341631b3cdaef036edb04f55bf58974854a6b8 /pkgs/os-specific/linux/sysdig | |
parent | 0f64522e25943c1aed57487f086b83c065830695 (diff) | |
parent | bb724fa986f6be4663f0cf15949bbb8de5814ff1 (diff) | |
download | nixpkgs-0251d3abea7742f8f2050f135c266c979bd913c3.tar nixpkgs-0251d3abea7742f8f2050f135c266c979bd913c3.tar.gz nixpkgs-0251d3abea7742f8f2050f135c266c979bd913c3.tar.bz2 nixpkgs-0251d3abea7742f8f2050f135c266c979bd913c3.tar.lz nixpkgs-0251d3abea7742f8f2050f135c266c979bd913c3.tar.xz nixpkgs-0251d3abea7742f8f2050f135c266c979bd913c3.tar.zst nixpkgs-0251d3abea7742f8f2050f135c266c979bd913c3.zip |
Merge pull request #217794 from jfly/scap-driver-linux-6_2-workaround
sysdig: Include driver patch to fix compilation on Linux 6.2
Diffstat (limited to 'pkgs/os-specific/linux/sysdig')
-rw-r--r-- | pkgs/os-specific/linux/sysdig/default.nix | 6 |
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 a05557468bd..72a148c26e7 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" |