From 60d68c19f9acff9c3582726fa0e3cdda1f4ae370 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Wed, 29 Apr 2026 22:15:46 -0400 Subject: [PATCH] linuxPackages.opensnitch-ebpf: fix build with kernel >= 6.19 --- pkgs/os-specific/linux/opensnitch-ebpf/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/os-specific/linux/opensnitch-ebpf/default.nix b/pkgs/os-specific/linux/opensnitch-ebpf/default.nix index 2f701298a882..663d00ea3a83 100644 --- a/pkgs/os-specific/linux/opensnitch-ebpf/default.nix +++ b/pkgs/os-specific/linux/opensnitch-ebpf/default.nix @@ -10,6 +10,7 @@ bc, opensnitch, nixosTests, + fetchpatch2, }: stdenv.mkDerivation rec { @@ -18,6 +19,17 @@ stdenv.mkDerivation rec { inherit (opensnitch) src; + patches = [ + (fetchpatch2 { + # fixes build failures on kernel >= 6.19 (#490127) + # remove when added to a release + name = "fix-kernel-6.19-build.patch"; + stripLen = 1; + url = "https://github.com/evilsocket/opensnitch/commit/614537c92ec82f54f76a45fb406ad2fb6e6fa618.patch?full_index=1"; + hash = "sha256-FCJfDhgmnm1GXPDaxr+YpVWTRrwBvjVzvGdZSFB6SqQ="; + }) + ]; + sourceRoot = "${src.name}/ebpf_prog"; nativeBuildInputs = with llvmPackages; [ @@ -35,6 +47,7 @@ stdenv.mkDerivation rec { # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=opensnitch-ebpf-module&id=984b952a784eb701f691dd9f2d45dfeb8d15053b env.NIX_CFLAGS_COMPILE = "-fno-stack-protector"; + env.KERNEL_VER = kernel.modDirVersion; env.KERNEL_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"; env.KERNEL_HEADERS = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";