From af9ea7040c52a9ca0bc4f42075987b6ec0703c3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 5 Apr 2021 10:38:14 +0200 Subject: [PATCH] python3Packages.recoll: init Also move some stuff to recoll's nativeBuildInputs. --- pkgs/applications/search/recoll/default.nix | 10 ++++++---- pkgs/top-level/python-packages.nix | 4 ++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index b14eb994207..5a3ea35faa3 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -48,10 +48,12 @@ mkDerivation rec { ++ lib.optionals (!withGui) [ "--disable-qtgui" "--disable-x11mon" ] ++ (if stdenv.isLinux then [ "--with-inotify" ] else [ "--without-inotify" ]); - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + file pkg-config python3Packages.setuptools which + ]; - buildInputs = with python3Packages; [ - bison chmlib file python setuptools which xapian zlib + buildInputs = [ + bison chmlib python3Packages.python xapian zlib ] ++ lib.optional withGui qtbase ++ lib.optional stdenv.isDarwin libiconv; @@ -100,6 +102,6 @@ mkDerivation rec { homepage = "https://www.lesbonscomptes.com/recoll/"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = [ maintainers.jcumming ]; + maintainers = with maintainers; [ jcumming kiyengar ]; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 19442dff09d..a7f1f98f6a8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7164,6 +7164,10 @@ in { recaptcha_client = callPackage ../development/python-modules/recaptcha_client { }; + recoll = disabledIf (!isPy3k) (toPythonModule (pkgs.recoll.override { + python3Packages = self; + })); + recommonmark = callPackage ../development/python-modules/recommonmark { }; redbaron = callPackage ../development/python-modules/redbaron { };