nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-23 12:34:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

recoll: fix cross

Browse Source 
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`
This commit is contained in:
Adam Joseph 2023-06-07 10:37:55 -07:00 committed by Emery Hemingway
parent 2c5682c927
commit d61bdc7ded
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/search/recoll/default.nix
View File

@ -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 [