From a10bca57bb2e8146513de8cf09e8ca4092f39c0d Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Thu, 26 Jun 2025 11:57:03 -0700
Subject: [PATCH 1/2] gqrx: move to by-name

---
 .../default.nix => by-name/gq/gqrx/package.nix}     | 13 +++++--------
 pkgs/top-level/all-packages.nix                     |  5 ++---
 2 files changed, 7 insertions(+), 11 deletions(-)
 rename pkgs/{applications/radio/gqrx/default.nix => by-name/gq/gqrx/package.nix} (95%)

diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/by-name/gq/gqrx/package.nix
similarity index 95%
rename from pkgs/applications/radio/gqrx/default.nix
rename to pkgs/by-name/gq/gqrx/package.nix
index 61e77bba6824..1db90ede113f 100644
--- a/pkgs/applications/radio/gqrx/default.nix
+++ b/pkgs/by-name/gq/gqrx/package.nix
@@ -4,9 +4,7 @@
   cmake,
   desktopToDarwinBundle,
   pkg-config,
-  qtbase,
-  qtsvg,
-  qtwayland,
+  qt6Packages,
   gnuradioMinimal,
   thrift,
   mpir,
@@ -14,7 +12,6 @@
   alsa-lib,
   libjack2,
   wrapGAppsHook3,
-  wrapQtAppsHook,
   # drivers (optional):
   rtl-sdr,
   hackrf,
@@ -44,7 +41,7 @@ gnuradioMinimal.pkgs.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    qt6Packages.wrapQtAppsHook
     wrapGAppsHook3
   ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
 
@@ -55,15 +52,15 @@ gnuradioMinimal.pkgs.mkDerivation rec {
       fftwFloat
       libjack2
       gnuradioMinimal.unwrapped.boost
-      qtbase
-      qtsvg
+      qt6Packages.qtbase
+      qt6Packages.qtsvg
       gnuradioMinimal.pkgs.osmosdr
       rtl-sdr
       hackrf
     ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [
       alsa-lib
-      qtwayland
+      qt6Packages.qtwayland
     ]
     ++ lib.optionals (gnuradioMinimal.hasFeature "gr-ctrlport") [
       thrift
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 09a5540fec3f..9321f27159b0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12222,12 +12222,11 @@ with pkgs;
 
   inherit (ocamlPackages) google-drive-ocamlfuse;
 
-  gqrx = qt6Packages.callPackage ../applications/radio/gqrx { };
-  gqrx-portaudio = qt6Packages.callPackage ../applications/radio/gqrx {
+  gqrx-portaudio = gqrx.override {
     portaudioSupport = true;
     pulseaudioSupport = false;
   };
-  gqrx-gr-audio = qt6Packages.callPackage ../applications/radio/gqrx {
+  gqrx-gr-audio = gqrx.override {
     portaudioSupport = false;
     pulseaudioSupport = false;
   };

From d103e67626d85a588402264d09cde14b2426b11c Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Thu, 26 Jun 2025 11:58:06 -0700
Subject: [PATCH 2/2] qgrx: remove with lib

---
 pkgs/by-name/gq/gqrx/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/gq/gqrx/package.nix b/pkgs/by-name/gq/gqrx/package.nix
index 1db90ede113f..d9ddb2c6c3a6 100644
--- a/pkgs/by-name/gq/gqrx/package.nix
+++ b/pkgs/by-name/gq/gqrx/package.nix
@@ -89,7 +89,7 @@ gnuradioMinimal.pkgs.mkDerivation rec {
     qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Software defined radio (SDR) receiver";
     mainProgram = "gqrx";
     longDescription = ''
@@ -101,9 +101,9 @@ gnuradioMinimal.pkgs.mkDerivation rec {
     homepage = "https://gqrx.dk/";
     # Some of the code comes from the Cutesdr project, with a BSD license, but
     # it's currently unknown which version of the BSD license that is.
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    maintainers = with lib.maintainers; [
       bjornfor
       fpletz
     ];