From 46475b96c76fc5fce01781d3bdb65a13f5c47e98 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Fri, 15 Sep 2023 10:31:15 +0200 Subject: [PATCH] recoll: 1.33.4 -> 1.35.0 --- pkgs/applications/search/recoll/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 3058d83bf58..fdc8b6317a9 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -3,6 +3,7 @@ , lib , mkDerivation , antiword +, aspell , bison , catdoc , catdvi @@ -27,6 +28,7 @@ , poppler_utils , python3Packages , qtbase +, qttools , unrtf , untex , unzip @@ -68,11 +70,11 @@ in mkDerivation rec { pname = "recoll"; - version = "1.33.4"; + version = "1.35.0"; src = fetchurl { url = "https://www.lesbonscomptes.com/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-ffD49sGYWYEWAFPRtpyDU/CYFvkrEDL21Ddq3QsXCvc="; + hash = "sha256-5msEeHCdrpPS0VMCVohYNllaFJJdXRn8laY6BNBt+UE="; }; configureFlags = [ @@ -102,18 +104,19 @@ mkDerivation rec { ./fix-datadir.patch ]; - nativeBuildInputs = lib.optionals withGui [ - qtbase - ] ++ [ + nativeBuildInputs = [ + makeWrapper pkg-config + which + ] ++ lib.optionals withGui [ + qtbase + qttools ] ++ lib.optionals withPython [ python3Packages.setuptools - ] ++ [ - makeWrapper - which ]; buildInputs = [ + aspell bison chmlib ] ++ lib.optionals withPython [