From bfdaa1aa33719e61f80e824de12815b28081b437 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 18 Jun 2026 11:01:13 +0200
Subject: [PATCH] ntirpc: 7.2 -> 9.16

---
 pkgs/by-name/nt/ntirpc/package.nix      | 16 ++++++++++------
 pkgs/by-name/nt/ntirpc/pkg-config.patch | 12 ++++++++++++
 2 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/by-name/nt/ntirpc/pkg-config.patch

diff --git a/pkgs/by-name/nt/ntirpc/package.nix b/pkgs/by-name/nt/ntirpc/package.nix
index f2b8f7bef38a..f7654a9052d8 100644
--- a/pkgs/by-name/nt/ntirpc/package.nix
+++ b/pkgs/by-name/nt/ntirpc/package.nix
@@ -8,28 +8,30 @@
   libtirpc,
   libnsl,
   prometheus-cpp-lite,
+  rdma-core,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ntirpc";
-  version = "7.2";
+  version = "9.16";
 
   src = fetchFromGitHub {
     owner = "nfs-ganesha";
     repo = "ntirpc";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-4E6wDAwinCNn7arRgBulg7e0x9S/steh+mjwNY4X3Vc=";
+    hash = "sha256-ZpjP1ugT9gN3TW7roBfJJBA6Y6FCkaOl31WRoRqPvTU=";
   };
 
   outputs = [
     "out"
     "dev"
   ];
-  postPatch = ''
-    substituteInPlace CMakeLists.txt --replace-fail \
-      "cmake_minimum_required(VERSION 2.6.3)" \
-      "cmake_minimum_required(VERSION 3.10)"
 
+  patches = [
+    ./pkg-config.patch
+  ];
+
+  postPatch = ''
     substituteInPlace ntirpc/netconfig.h --replace-fail \
       "/etc/netconfig" "$out/etc/netconfig"
   '';
@@ -40,10 +42,12 @@ stdenv.mkDerivation (finalAttrs: {
     liburcu
     libnsl
     prometheus-cpp-lite
+    rdma-core
   ];
 
   cmakeFlags = [
     "-DUSE_MONITORING=ON"
+    "-DUSE_RPC_RDMA=ON"
   ];
 
   postInstall = ''
diff --git a/pkgs/by-name/nt/ntirpc/pkg-config.patch b/pkgs/by-name/nt/ntirpc/pkg-config.patch
new file mode 100644
index 000000000000..3107fddcb1e0
--- /dev/null
+++ b/pkgs/by-name/nt/ntirpc/pkg-config.patch
@@ -0,0 +1,12 @@
+diff --git a/libntirpc.pc.in.cmake b/libntirpc.pc.in.cmake
+index 6650568..3aaea1d 100644
+--- a/libntirpc.pc.in.cmake
++++ b/libntirpc.pc.in.cmake
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@
+ includedir=${prefix}/include/ntirpc
+ 
+ Name: libntirpc