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 82% rename from pkgs/applications/misc/coolreader/default.nix rename to pkgs/by-name/co/coolreader/package.nix index 3dc6b10a22f1..8b15cb75533c 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, @@ -18,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 ]; @@ -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 df02d9cf0d0b..4067e9480dca 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;