From 25279a16c6738e3a51253fdc604ea536fea3c302 Mon Sep 17 00:00:00 2001
From: GraysonTinker <graysontinker@gmail.com>
Date: Sat, 11 Apr 2026 09:22:26 -0700
Subject: [PATCH] klog: migrate to by-name

---
 .../kl/klog/package.nix}                      | 25 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 10 insertions(+), 17 deletions(-)
 rename pkgs/{applications/radio/klog/default.nix => by-name/kl/klog/package.nix} (71%)

diff --git a/pkgs/applications/radio/klog/default.nix b/pkgs/by-name/kl/klog/package.nix
similarity index 71%
rename from pkgs/applications/radio/klog/default.nix
rename to pkgs/by-name/kl/klog/package.nix
index 48e70b24d7b5..f6d13a2b05ad 100644
--- a/pkgs/applications/radio/klog/default.nix
+++ b/pkgs/by-name/kl/klog/package.nix
@@ -4,34 +4,29 @@
   fetchurl,
   hamlib,
   pkg-config,
-  qtbase,
-  qttools,
-  qtserialport,
-  qtcharts,
-  qmake,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "klog";
   version = "1.3.2";
 
   src = fetchurl {
-    url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
+    url = "mirror://savannah/${finalAttrs.pname}/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
     sha256 = "1d5x7rq0mgfrqws3q1y4z8wh2qa3gvsmd0ssf2yqgkyq3fhdrb5c";
   };
 
   nativeBuildInputs = [
     pkg-config
-    wrapQtAppsHook
-    qmake
-    qttools
+    libsForQt5.wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.qttools
   ];
   buildInputs = [
     hamlib
-    qtbase
-    qtserialport
-    qtcharts
+    libsForQt5.qtbase
+    libsForQt5.qtserialport
+    libsForQt5.qtcharts
   ];
 
   qmakeFlags = [ "KLog.pro" ];
@@ -48,4 +43,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ pulsation ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a09c77b2e54..019be4c8520e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1814,8 +1814,6 @@ with pkgs;
 
   klipper-genconf = callPackage ../servers/klipper/klipper-genconf.nix { };
 
-  klog = qt5.callPackage ../applications/radio/klog { };
-
   lexicon = with python3Packages; toPythonApplication dns-lexicon;
 
   lgogdownloader-gui = callPackage ../by-name/lg/lgogdownloader/package.nix { enableGui = true; };