From f9dd23d457c1854ea96a0b5b6ffb81ef47629779 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Mon, 8 Sep 2025 12:53:59 +0200
Subject: [PATCH] nrfutil: point wrapper to several executables

---
 pkgs/by-name/nr/nrfutil/package.nix | 30 ++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/nr/nrfutil/package.nix b/pkgs/by-name/nr/nrfutil/package.nix
index 8d28d56e78f0..7d7059fead0f 100644
--- a/pkgs/by-name/nr/nrfutil/package.nix
+++ b/pkgs/by-name/nr/nrfutil/package.nix
@@ -95,11 +95,31 @@ symlinkJoin {
 
   nativeBuildInputs = [ makeWrapper ];
 
-  postBuild = ''
-    wrapProgram $out/bin/nrfutil \
-      --prefix PATH ":" "$out/bin" \
-      --set NRF_JLINK_DLL_PATH "${segger-jlink-headless}/lib/libjlinkarm.so"
-  '';
+  postBuild =
+    let
+      wrapProgramArgs = lib.concatStringsSep " " (
+        [
+          ''--prefix PATH : "$out/bin"''
+          ''--prefix PATH : "$out"/lib/nrfutil-npm''
+          ''--prefix PATH : "$out"/lib/nrfutil-nrf5sdk-tools''
+          ''--set NRF_JLINK_DLL_PATH '${segger-jlink-headless}'/lib/libjlinkarm.so''
+          ''--set NRFUTIL_BLE_SNIFFER_SHIM_BIN_ENV "$out"/lib/nrfutil-ble-sniffer/wireshark-shim''
+          ''--set NRFUTIL_BLE_SNIFFER_HCI_SHIM_BIN_ENV "$out"/lib/nrfutil-ble-sniffer/wireshark-hci-shim''
+        ]
+        ++ (
+          let
+            # These are the extensions with the probe-plugin-worker executable vendored.
+            relevantExtensions = lib.intersectLists [ "nrfutil-device" "nrfutil-trace" ] extensions;
+          in
+          lib.optionals (relevantExtensions != [ ]) [
+            ''--set NRF_PROBE_PATH "$out"/lib/${lib.head relevantExtensions}''
+          ]
+        )
+      );
+    in
+    ''
+      wrapProgram $out/bin/nrfutil ${wrapProgramArgs}
+    '';
 
   passthru = {
     updateScript = ./update.sh;