From fcbf7589155a81382d759ba2c9d984001855ebb7 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 12 Jan 2026 13:07:00 +0200
Subject: [PATCH 1/3] gnuradio: use --replace-fail in python substitution

---
 pkgs/applications/radio/gnuradio/wrapper.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/radio/gnuradio/wrapper.nix b/pkgs/applications/radio/gnuradio/wrapper.nix
index f7b96b1c1b95..b226ce3d68d6 100644
--- a/pkgs/applications/radio/gnuradio/wrapper.nix
+++ b/pkgs/applications/radio/gnuradio/wrapper.nix
@@ -246,7 +246,7 @@ let
             mv -f "$i".tmp "$i"
             if head -1 "$i" | grep -q ${unwrapped.python}; then
               substituteInPlace "$i" \
-                --replace ${unwrapped.python} ${pythonEnv}
+                --replace-fail ${unwrapped.python} ${pythonEnv}
             fi
             wrapProgram "$i" ${makeWrapperArgs}
           done

From 7dc2d2b587e06d19290a0f0cac35374dac443256 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 12 Jan 2026 13:13:13 +0200
Subject: [PATCH 2/3] gnuradio: use lndir instead of xorg.lndir

---
 pkgs/applications/radio/gnuradio/wrapper.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/radio/gnuradio/wrapper.nix b/pkgs/applications/radio/gnuradio/wrapper.nix
index b226ce3d68d6..4f171832f99c 100644
--- a/pkgs/applications/radio/gnuradio/wrapper.nix
+++ b/pkgs/applications/radio/gnuradio/wrapper.nix
@@ -9,7 +9,7 @@
   # For the wrapper
   makeWrapper,
   # For lndir
-  xorg,
+  lndir,
   # To define a the gnuradio.pkgs scope
   newScope,
   # For Emulating wrapGAppsHook3
@@ -222,7 +222,7 @@ let
           ;
         nativeBuildInputs = [
           makeWrapper
-          xorg.lndir
+          lndir
         ];
         buildCommand = ''
           mkdir $out

From d05914593c88562b20e90ec35614eca21bd214a8 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 12 Jan 2026 13:19:14 +0200
Subject: [PATCH 3/3] gnuradio: lndir to $man properly

---
 pkgs/applications/radio/gnuradio/wrapper.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/radio/gnuradio/wrapper.nix b/pkgs/applications/radio/gnuradio/wrapper.nix
index 4f171832f99c..a741697af3b1 100644
--- a/pkgs/applications/radio/gnuradio/wrapper.nix
+++ b/pkgs/applications/radio/gnuradio/wrapper.nix
@@ -225,10 +225,13 @@ let
           lndir
         ];
         buildCommand = ''
-          mkdir $out
+          ${builtins.concatStringsSep "\n" (
+            map (output: ''
+              mkdir ''$${output}
+              lndir -silent ${unwrapped.${output}} ''$${output}
+            '') outputs
+          )}
           cd $out
-          lndir -silent ${unwrapped.out}
-          lndir -silent ${unwrapped.man}
           ${lib.optionalString (extraPackages != [ ]) (
             builtins.concatStringsSep "\n" (
               map (pkg: ''