Unverified Commit 0251d3ab authored by 7c6f434c's avatar 7c6f434c Committed by GitHub
Browse files

Merge pull request #217794 from jfly/scap-driver-linux-6_2-workaround 

sysdig: Include driver patch to fix compilation on Linux 6.2
parents 0f64522e bb724fa9

pkgs/os-specific/linux/sysdig/default.nix

+6 −0
Original line number Diff line number Diff line
@@ -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"