From d61bdc7ded28212cddbd0eaf870b43301bdbf974 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Wed, 7 Jun 2023 10:37:55 -0700 Subject: [PATCH] recoll: fix cross This commit fixes cross-compilation of recoll by: 1. Disabling the python module when cross compiling 2. Removing `file` from `nativeBuildInputs`, since it leaks into recoll-*.so, and forcing use of the hostPlatform `file` by adding the configureFlag that does that. 3. Adding `qtbase` to `nativeBuildInputs` if `withGui` --- pkgs/applications/search/recoll/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index daf611b91f7c..898f1040d591 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -49,6 +49,12 @@ mkDerivation rec { "--enable-recollq" "--disable-webkit" "--without-systemd" + + # this leaks into the final `librecoll-*.so` binary, so we need + # to be sure it is taken from `pkgs.file` rather than `stdenv`, + # especially when cross-compiling + "--with-file-command=${file}/bin/file" + ] ++ lib.optionals (!withPython) [ "--disable-python-module" "--disable-python-chm" @@ -68,8 +74,9 @@ mkDerivation rec { ./fix-datadir.patch ]; - nativeBuildInputs = [ - file + nativeBuildInputs = lib.optionals withGui [ + qtbase + ] ++ [ pkg-config ] ++ lib.optionals withPython [ python3Packages.setuptools @@ -87,6 +94,7 @@ mkDerivation rec { ] ++ [ xapian zlib + file ] ++ lib.optionals withGui [ qtbase ] ++ lib.optionals stdenv.isDarwin [