recoll: 1.33.4 -> 1.35.0

This commit is contained in:
Emery Hemingway 2023-09-15 10:31:15 +02:00
parent e05000740f
commit 46475b96c7

View File

@ -3,6 +3,7 @@
, lib , lib
, mkDerivation , mkDerivation
, antiword , antiword
, aspell
, bison , bison
, catdoc , catdoc
, catdvi , catdvi
@ -27,6 +28,7 @@
, poppler_utils , poppler_utils
, python3Packages , python3Packages
, qtbase , qtbase
, qttools
, unrtf , unrtf
, untex , untex
, unzip , unzip
@ -68,11 +70,11 @@ in
mkDerivation rec { mkDerivation rec {
pname = "recoll"; pname = "recoll";
version = "1.33.4"; version = "1.35.0";
src = fetchurl { src = fetchurl {
url = "https://www.lesbonscomptes.com/${pname}/${pname}-${version}.tar.gz"; url = "https://www.lesbonscomptes.com/${pname}/${pname}-${version}.tar.gz";
sha256 = "sha256-ffD49sGYWYEWAFPRtpyDU/CYFvkrEDL21Ddq3QsXCvc="; hash = "sha256-5msEeHCdrpPS0VMCVohYNllaFJJdXRn8laY6BNBt+UE=";
}; };
configureFlags = [ configureFlags = [
@ -102,18 +104,19 @@ mkDerivation rec {
./fix-datadir.patch ./fix-datadir.patch
]; ];
nativeBuildInputs = lib.optionals withGui [ nativeBuildInputs = [
qtbase makeWrapper
] ++ [
pkg-config pkg-config
which
] ++ lib.optionals withGui [
qtbase
qttools
] ++ lib.optionals withPython [ ] ++ lib.optionals withPython [
python3Packages.setuptools python3Packages.setuptools
] ++ [
makeWrapper
which
]; ];
buildInputs = [ buildInputs = [
aspell
bison bison
chmlib chmlib
] ++ lib.optionals withPython [ ] ++ lib.optionals withPython [