Merge pull request #255248 from ehmry/recoll (0ae23e4a) · Commits · nix / nixpkgs

pkgs/applications/search/recoll/default.nix

+11 −8

Original line number	Diff line number	Diff line
		@@ -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 [