From 7a2c5f004c0de9c525f50da93adfad46d4b4c61f Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Fri, 3 Apr 2026 08:41:23 -0500
Subject: [PATCH 1/2] coolreader: migrate to by-name

---
 .../co}/coolreader/cmake_policy_version_3_5.patch          | 0
 .../default.nix => by-name/co/coolreader/package.nix}      | 7 +++----
 pkgs/top-level/all-packages.nix                            | 2 --
 3 files changed, 3 insertions(+), 6 deletions(-)
 rename pkgs/{applications/misc => by-name/co}/coolreader/cmake_policy_version_3_5.patch (100%)
 rename pkgs/{applications/misc/coolreader/default.nix => by-name/co/coolreader/package.nix} (93%)

diff --git a/pkgs/applications/misc/coolreader/cmake_policy_version_3_5.patch b/pkgs/by-name/co/coolreader/cmake_policy_version_3_5.patch
similarity index 100%
rename from pkgs/applications/misc/coolreader/cmake_policy_version_3_5.patch
rename to pkgs/by-name/co/coolreader/cmake_policy_version_3_5.patch
diff --git a/pkgs/applications/misc/coolreader/default.nix b/pkgs/by-name/co/coolreader/package.nix
similarity index 93%
rename from pkgs/applications/misc/coolreader/default.nix
rename to pkgs/by-name/co/coolreader/package.nix
index 3dc6b10a22f1..fdf9bce196c8 100644
--- a/pkgs/applications/misc/coolreader/default.nix
+++ b/pkgs/by-name/co/coolreader/package.nix
@@ -3,9 +3,8 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  wrapQtAppsHook,
   lib,
-  qttools,
+  qt5,
   fribidi,
   libunibreak,
   zstd,
@@ -27,11 +26,11 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qttools
+    qt5.qttools
     fribidi
     libunibreak
     zstd
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30cc67350b58..40872866265c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1493,8 +1493,6 @@ with pkgs;
 
   coconut = with python312Packages; toPythonApplication coconut;
 
-  coolreader = libsForQt5.callPackage ../applications/misc/coolreader { };
-
   corsair = with python3Packages; toPythonApplication corsair-scan;
 
   inherit (cue) writeCueValidator;

From a054da4484c2dfad71636bfa948a4330ff70dbcb Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Fri, 3 Apr 2026 08:42:44 -0500
Subject: [PATCH 2/2] coolreader: modernize derivation

---
 pkgs/by-name/co/coolreader/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/coolreader/package.nix b/pkgs/by-name/co/coolreader/package.nix
index fdf9bce196c8..8b15cb75533c 100644
--- a/pkgs/by-name/co/coolreader/package.nix
+++ b/pkgs/by-name/co/coolreader/package.nix
@@ -17,8 +17,8 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "buggins";
     repo = "coolreader";
-    rev = "cr${finalAttrs.version}";
-    sha256 = "sha256-RgVEOaNBaEuPBC75B8PdCkbqMvEzNmnEYmiI1ny/WFQ=";
+    tag = "cr${finalAttrs.version}";
+    hash = "sha256-RgVEOaNBaEuPBC75B8PdCkbqMvEzNmnEYmiI1ny/WFQ=";
   };
 
   patches = [ ./cmake_policy_version_3_5.patch ];