From e8f0c54d4bb83da8dc56372d88950f8b94c73487 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Mon, 25 May 2026 10:59:35 -0500
Subject: [PATCH] klayout: migrate to by-name

---
 .../kl/klayout/package.nix}                   | 32 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 13 insertions(+), 21 deletions(-)
 rename pkgs/{applications/misc/klayout/default.nix => by-name/kl/klayout/package.nix} (91%)

diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/by-name/kl/klayout/package.nix
similarity index 91%
rename from pkgs/applications/misc/klayout/default.nix
rename to pkgs/by-name/kl/klayout/package.nix
index be1903c6310f..4c9bf9a24672 100644
--- a/pkgs/applications/misc/klayout/default.nix
+++ b/pkgs/by-name/kl/klayout/package.nix
@@ -14,13 +14,7 @@
   expat,
   curl,
   zlib,
-  wrapQtAppsHook,
-  qmake,
-  qtbase,
-  qtmultimedia,
-  qtsvg,
-  qttools,
-  qt5compat,
+  qt6,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -49,21 +43,21 @@ stdenv.mkDerivation (finalAttrs: {
     perl
     ruby
     which
-    wrapQtAppsHook
-    qmake
-    qtbase
-    qtmultimedia
-    qtsvg
-    qttools
-    qt5compat
+    qt6.wrapQtAppsHook
+    qt6.qmake
+    qt6.qtbase
+    qt6.qtmultimedia
+    qt6.qtsvg
+    qt6.qttools
+    qt6.qt5compat
   ];
 
   buildInputs = [
-    qtbase
-    qtmultimedia
-    qtsvg
-    qttools
-    qt5compat
+    qt6.qtbase
+    qt6.qtmultimedia
+    qt6.qtsvg
+    qt6.qttools
+    qt6.qt5compat
     libgit2
     libpng
     expat
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 02866760494f..69b5292102aa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9459,8 +9459,6 @@ with pkgs;
     ;
   k3s = k3s_1_35;
 
-  klayout = qt6Packages.callPackage ../applications/misc/klayout { };
-
   kotatogram-desktop =
     callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop
       { };