From 4907bfd7eed10118ccd97c7edb37e5fb90743579 Mon Sep 17 00:00:00 2001
From: Filippo Berto <berto.f@protonmail.com>
Date: Mon, 29 Jul 2024 16:27:38 +0200
Subject: [PATCH] ndn-tools: 22.12 -> 24.07

---
 pkgs/tools/networking/ndn-tools/default.nix | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/pkgs/tools/networking/ndn-tools/default.nix b/pkgs/tools/networking/ndn-tools/default.nix
index 1cbc6d403a9d..7343dbe072ba 100644
--- a/pkgs/tools/networking/ndn-tools/default.nix
+++ b/pkgs/tools/networking/ndn-tools/default.nix
@@ -1,6 +1,6 @@
 { lib
 , stdenv
-, boost
+, boost ? ndn-cxx.boost
 , fetchFromGitHub
 , libpcap
 , ndn-cxx
@@ -12,26 +12,15 @@
 
 stdenv.mkDerivation rec {
   pname = "ndn-tools";
-  version = "22.12";
+  version = "24.07";
 
   src = fetchFromGitHub {
     owner = "named-data";
-    repo = pname;
+    repo = "ndn-tools";
     rev = "ndn-tools-${version}";
-    sha256 = "sha256-28sPgo2nq5AhIzZmvDz38echGPzKDzNm2J6iIao4yL8=";
+    sha256 = "sha256-rzGd+8SkztrkXRXcEcQm6rOtAGnF7h/Jg8jaBb7FP9w=";
   };
 
-  # Hacky workaround for new pcap-config.
-  postPatch = ''
-    patch -p1 <<EOF
-      --- a/tools/dump/wscript
-      +++ b/tools/dump/wscript
-      @@ -5 +5 @@
-      -    conf.check_cfg(package='libpcap', uselib_store='PCAP',
-      +    conf.check_cfg(package="", uselib_store='PCAP',
-    EOF
-  '';
-
   nativeBuildInputs = [ pkg-config sphinx wafHook ];
   buildInputs = [ libpcap ndn-cxx openssl ];