From cea7911fa6a34049de1b7a3cba5f7ba799d0f9db Mon Sep 17 00:00:00 2001
From: Gavin John <gavinnjohn@gmail.com>
Date: Sun, 11 May 2025 00:25:34 -0700
Subject: [PATCH] direwolf: move to by-name

---
 .../di/direwolf/package.nix}                  | 21 +++++++++----------
 pkgs/top-level/all-packages.nix               |  4 ----
 2 files changed, 10 insertions(+), 15 deletions(-)
 rename pkgs/{applications/radio/direwolf/default.nix => by-name/di/direwolf/package.nix} (72%)

diff --git a/pkgs/applications/radio/direwolf/default.nix b/pkgs/by-name/di/direwolf/package.nix
similarity index 72%
rename from pkgs/applications/radio/direwolf/default.nix
rename to pkgs/by-name/di/direwolf/package.nix
index ef11484bb423..f917882ff15c 100644
--- a/pkgs/applications/radio/direwolf/default.nix
+++ b/pkgs/by-name/di/direwolf/package.nix
@@ -7,7 +7,8 @@
   alsa-lib,
   gpsd,
   gpsdSupport ? false,
-  hamlib,
+  hamlib_4,
+  hamlib ? hamlib_4,
   hamlibSupport ? true,
   perl,
   portaudio,
@@ -64,23 +65,21 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace conf/CMakeLists.txt \
-      --replace /etc/udev/rules.d/ $out/lib/udev/rules.d/
+      --replace-fail /etc/udev/rules.d/ $out/lib/udev/rules.d/
     substituteInPlace src/symbols.c \
-      --replace /usr/share/direwolf/symbols-new.txt $out/share/direwolf/symbols-new.txt \
-      --replace /opt/local/share/direwolf/symbols-new.txt $out/share/direwolf/symbols-new.txt
+      --replace-fail /usr/share/direwolf/symbols-new.txt $out/share/direwolf/symbols-new.txt \
+      --replace-fail /opt/local/share/direwolf/symbols-new.txt $out/share/direwolf/symbols-new.txt
     substituteInPlace src/decode_aprs.c \
-      --replace /usr/share/direwolf/tocalls.txt $out/share/direwolf/tocalls.txt \
-      --replace /opt/local/share/direwolf/tocalls.txt $out/share/direwolf/tocalls.txt
+      --replace-fail /usr/share/direwolf/tocalls.txt $out/share/direwolf/tocalls.txt \
+      --replace-fail /opt/local/share/direwolf/tocalls.txt $out/share/direwolf/tocalls.txt
     substituteInPlace cmake/cpack/direwolf.desktop.in \
-      --replace 'Terminal=false' 'Terminal=true' \
-      --replace 'Exec=@APPLICATION_DESKTOP_EXEC@' 'Exec=direwolf'
-    substituteInPlace src/dwgpsd.c \
-      --replace 'GPSD_API_MAJOR_VERSION > 11' 'GPSD_API_MAJOR_VERSION > 14'
+      --replace-fail 'Terminal=false' 'Terminal=true' \
+      --replace-fail 'Exec=@APPLICATION_DESKTOP_EXEC@' 'Exec=direwolf'
   ''
   + lib.optionalString extraScripts ''
     patchShebangs scripts/dwespeak.sh
     substituteInPlace scripts/dwespeak.sh \
-      --replace espeak ${espeak}/bin/espeak
+      --replace-fail espeak ${espeak}/bin/espeak
   '';
 
   doInstallCheck = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b5077b829332..a2c59749b7bc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10959,10 +10959,6 @@ with pkgs;
 
   dfasma = libsForQt5.callPackage ../applications/audio/dfasma { };
 
-  direwolf = callPackage ../applications/radio/direwolf {
-    hamlib = hamlib_4;
-  };
-
   djv = callPackage ../by-name/dj/djv/package.nix { openexr = openexr_2; };
 
   djview4 = djview;