From 212a24952c2fed0bfc3306e1927e6e351feee510 Mon Sep 17 00:00:00 2001
From: Adrian Pistol <vifino@tty.sh>
Date: Sun, 19 Mar 2023 16:30:39 +0100
Subject: [PATCH] xdp-tools: 1.2.9 -> 1.3.1

Needs a small patch, because since 1.3.0 btf__type_cnt detection is broken. Will be in next release.
---
 pkgs/tools/networking/xdp-tools/default.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/xdp-tools/default.nix b/pkgs/tools/networking/xdp-tools/default.nix
index 45b557e2739b..0e5a27ddd17a 100644
--- a/pkgs/tools/networking/xdp-tools/default.nix
+++ b/pkgs/tools/networking/xdp-tools/default.nix
@@ -6,6 +6,7 @@
 , elfutils
 , zlib
 , libpcap
+, bpftools
 , llvmPackages
 , pkg-config
 , m4
@@ -15,15 +16,23 @@
 }:
 stdenv.mkDerivation rec {
   pname = "xdp-tools";
-  version = "1.2.9";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "xdp-project";
     repo = "xdp-tools";
     rev = "v${version}";
-    sha256 = "Q1vaogcAeNjLIPaB0ovOo96hzRv69tMO5xwHh5W4Ws0=";
+    sha256 = "ctggXzc3qA+m2/nJ9lmR/pERj0YyPko3MTttm8e85cU=";
   };
 
+  patches = [
+    # Fix function detection for btf__type_cnt()
+    (fetchpatch {
+      url = "https://github.com/xdp-project/xdp-tools/commit/a7df567634af77381832a2212c5f5099b07734f3.patch";
+      sha256 = "1i4s4y0z9pf3dnjzxy8k0jkjshhz3b0v49qw4cspjrjlmcmy0x00";
+    })
+  ];
+
   outputs = [ "out" "lib" ];
 
   buildInputs = [
@@ -37,6 +46,7 @@ stdenv.mkDerivation rec {
     emacs-nox # to generate man pages from .org
   ];
   nativeBuildInputs = [
+    bpftools
     llvmPackages.clang
     llvmPackages.llvm
     pkg-config