From 5209d1126ddd0b950b84cb4030dc1d67be021059 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Wed, 27 Aug 2025 20:37:23 -0400
Subject: [PATCH 1/4] rtl-sdr-*: add dev output

---
 pkgs/applications/radio/rtl-sdr/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/applications/radio/rtl-sdr/default.nix b/pkgs/applications/radio/rtl-sdr/default.nix
index b0eb6627d12d..0b5b550cb4e9 100644
--- a/pkgs/applications/radio/rtl-sdr/default.nix
+++ b/pkgs/applications/radio/rtl-sdr/default.nix
@@ -17,10 +17,17 @@ let
     }:
     stdenv.mkDerivation {
       inherit version pname src;
+
+      outputs = [
+        "out"
+        "dev"
+      ];
+
       nativeBuildInputs = [
         pkg-config
         cmake
       ];
+
       propagatedBuildInputs = [ libusb1 ];
 
       cmakeFlags = lib.optionals stdenv.hostPlatform.isLinux [

From 76ab86dbf910035566d4de719a183212a9033e91 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Wed, 27 Aug 2025 20:44:58 -0400
Subject: [PATCH 2/4] svxlink: fix use of rtl-sdr

---
 pkgs/by-name/sv/svxlink/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sv/svxlink/package.nix b/pkgs/by-name/sv/svxlink/package.nix
index c26357a8ffb1..1b7a3bb3fd66 100644
--- a/pkgs/by-name/sv/svxlink/package.nix
+++ b/pkgs/by-name/sv/svxlink/package.nix
@@ -36,8 +36,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeFlags = [
     (lib.cmakeBool "DO_INSTALL_CHOWN" false)
-    (lib.cmakeFeature "RTLSDR_LIBRARIES" "${rtl-sdr}/lib/librtlsdr.so")
-    (lib.cmakeFeature "RTLSDR_INCLUDE_DIRS" "${rtl-sdr}/include")
+    (lib.cmakeFeature "RTLSDR_LIBRARIES" "${lib.getLib rtl-sdr}/lib/librtlsdr.so")
+    (lib.cmakeFeature "RTLSDR_INCLUDE_DIRS" "${lib.getInclude rtl-sdr}/include")
   ];
 
   dontWrapQtApps = true;

From d43cbc728d014e6dc4310db3f3cf9ba202028897 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Wed, 27 Aug 2025 20:47:12 -0400
Subject: [PATCH 3/4] guglielmo: fix use of rtl-sdr

---
 pkgs/by-name/gu/guglielmo/package.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/gu/guglielmo/package.nix b/pkgs/by-name/gu/guglielmo/package.nix
index b16b3393064a..7cfb6eb426fa 100644
--- a/pkgs/by-name/gu/guglielmo/package.nix
+++ b/pkgs/by-name/gu/guglielmo/package.nix
@@ -50,7 +50,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   postFixup = ''
     # guglielmo opens SDR libraries at run time
-    patchelf --add-rpath "${airspy}/lib:${rtl-sdr}/lib" $out/bin/.guglielmo-wrapped
+    patchelf --add-rpath "${
+      lib.makeLibraryPath [
+        airspy
+        rtl-sdr
+      ]
+    }" $out/bin/.guglielmo-wrapped
   '';
 
   meta = {

From c3421131033951ffcef6517829123ceb241774b4 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Wed, 27 Aug 2025 20:47:44 -0400
Subject: [PATCH 4/4] python313Packages.pyrtlsdr: fix use of rtl-sdr

---
 pkgs/development/python-modules/pyrtlsdr/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pyrtlsdr/default.nix b/pkgs/development/python-modules/pyrtlsdr/default.nix
index a82317688d5e..ec22db642180 100644
--- a/pkgs/development/python-modules/pyrtlsdr/default.nix
+++ b/pkgs/development/python-modules/pyrtlsdr/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ setuptools ];
 
   postPatch = ''
-    sed "s|driver_files =.*|driver_files = ['${rtl-sdr}/lib/librtlsdr.so']|" -i rtlsdr/librtlsdr.py
+    sed "s|driver_files =.*|driver_files = ['${lib.getLib rtl-sdr}/lib/librtlsdr.so']|" -i rtlsdr/librtlsdr.py
   '';
 
   # No tests that can be used.