From 58bae1819e47fd9cfc6955871e31766f32e31c39 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Tue, 23 Jul 2024 16:10:18 +0200 Subject: [PATCH] sysdig: patch 'main.c' to fix build for 6.10-kernel --- pkgs/os-specific/linux/sysdig/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index f1abf6a7389c..f3cbaaded978 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -26,6 +26,7 @@ clang, libbpf, bpftools, + fetchurl, }: let @@ -49,6 +50,13 @@ let hash = "sha256-FIlnJsNgofGo4HETEEpW28wpC3U9z5AZprwFR5AgFfA="; }; + # "main.c" from master after (https://github.com/falcosecurity/libs/pull/1884) + # Remove when an upstream release includes the driver update + driverKernel610MainC = fetchurl { + url = "https://raw.githubusercontent.com/falcosecurity/libs/fa26daf65bb4117ecfe099fcad48ea75fe86d8bb/driver/main.c"; + hash = "sha256-VI/tOSXs5OcEDehSqICF3apmSnwe4QCmbkHz+DGH4uM="; + }; + version = "0.38.0"; in stdenv.mkDerivation { @@ -109,6 +117,7 @@ stdenv.mkDerivation { cp -r ${driver} driver-src chmod -R +w driver-src + cp ${driverKernel610MainC} driver-src/driver/main.c cmakeFlagsArray+=( "-DFALCOSECURITY_LIBS_SOURCE_DIR=$(pwd)/libs"