From 1c4aa0d63fe2e67453e43dbc9a71e8e437b29184 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Thu, 26 Jun 2025 11:52:34 -0700
Subject: [PATCH] qdmr: move to by-name

---
 .../default.nix => by-name/qd/qdmr/package.nix}  | 16 ++++++----------
 pkgs/top-level/all-packages.nix                  |  2 --
 2 files changed, 6 insertions(+), 12 deletions(-)
 rename pkgs/{applications/radio/qdmr/default.nix => by-name/qd/qdmr/package.nix} (90%)

diff --git a/pkgs/applications/radio/qdmr/default.nix b/pkgs/by-name/qd/qdmr/package.nix
similarity index 90%
rename from pkgs/applications/radio/qdmr/default.nix
rename to pkgs/by-name/qd/qdmr/package.nix
index a9ea80e13e9a..9e5ac1f5ab56 100644
--- a/pkgs/applications/radio/qdmr/default.nix
+++ b/pkgs/by-name/qd/qdmr/package.nix
@@ -6,12 +6,8 @@
   cmake,
   libxslt,
   docbook_xsl_ns,
-  wrapQtAppsHook,
+  libsForQt5,
   libusb1,
-  qtlocation,
-  qtserialport,
-  qttools,
-  qtbase,
   yaml-cpp,
 }:
 
@@ -33,16 +29,16 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     libxslt
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
     installShellFiles
   ];
 
   buildInputs = [
     libusb1
-    qtlocation
-    qtserialport
-    qttools
-    qtbase
+    libsForQt5.qtlocation
+    libsForQt5.qtserialport
+    libsForQt5.qttools
+    libsForQt5.qtbase
     yaml-cpp
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 09a5540fec3f..acebeaea9bd8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -514,8 +514,6 @@ with pkgs;
     python3Packages = python311Packages;
   };
 
-  qdmr = libsForQt5.callPackage ../applications/radio/qdmr { };
-
   fetchbower = callPackage ../build-support/fetchbower { };
 
   fetchbzr = callPackage ../build-support/fetchbzr { };