From eaaca55ee2cf64f83f7c6a5a35e22990e804b177 Mon Sep 17 00:00:00 2001
From: qubitnano <146656568+qubitnano@users.noreply.github.com>
Date: Sat, 19 Oct 2024 20:19:24 -0400
Subject: [PATCH] calibre: migrate to by-name

---
 .../ca}/calibre/dont_build_unrar_plugin.patch       |  0
 .../default.nix => by-name/ca/calibre/package.nix}  | 13 +++++--------
 pkgs/top-level/all-packages.nix                     |  2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)
 rename pkgs/{applications/misc => by-name/ca}/calibre/dont_build_unrar_plugin.patch (100%)
 rename pkgs/{applications/misc/calibre/default.nix => by-name/ca/calibre/package.nix} (98%)

diff --git a/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch b/pkgs/by-name/ca/calibre/dont_build_unrar_plugin.patch
similarity index 100%
rename from pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch
rename to pkgs/by-name/ca/calibre/dont_build_unrar_plugin.patch
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/by-name/ca/calibre/package.nix
similarity index 98%
rename from pkgs/applications/misc/calibre/default.nix
rename to pkgs/by-name/ca/calibre/package.nix
index 9285a2bacd51..41479111b2ae 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/by-name/ca/calibre/package.nix
@@ -20,12 +20,9 @@
 , podofo
 , poppler_utils
 , python3Packages
-, qmake
-, qtbase
-, qtwayland
+, qt6
 , speechd-minimal
 , sqlite
-, wrapQtAppsHook
 , xdg-utils
 , wrapGAppsHook3
 , popplerSupport ? true
@@ -71,9 +68,9 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     pkg-config
-    qmake
+    qt6.qmake
+    qt6.wrapQtAppsHook
     wrapGAppsHook3
-    wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -92,8 +89,8 @@ stdenv.mkDerivation (finalAttrs: {
     piper-tts
     podofo
     poppler_utils
-    qtbase
-    qtwayland
+    qt6.qtbase
+    qt6.qtwayland
     sqlite
     (python3Packages.python.withPackages
       (ps: with ps; [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a80d2fc17fa1..72d2ea9f345a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28365,7 +28365,7 @@ with pkgs;
 
   calculix = callPackage ../applications/science/math/calculix { };
 
-  calibre = qt6Packages.callPackage ../applications/misc/calibre {
+  calibre = callPackage ../by-name/ca/calibre/package.nix {
     podofo = podofo010;
   };