Skip to content

notmuch: fix cross#225111

Closed
ghost wants to merge 3 commits intomasterfrom
unknown repository
Closed

notmuch: fix cross#225111
ghost wants to merge 3 commits intomasterfrom
unknown repository

Conversation

@ghost
Copy link
Copy Markdown

@ghost ghost commented Apr 7, 2023

Adapted from Void Linux commit 81c3c1884be1959337b55cd88d4748d17ac6c3de and f95b944252e3a1fc900a18c8eeed59e6de9b6e9a.

Note: withEmacs will be disabled automatically due to

@ofborg ofborg bot added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Apr 7, 2023
@ofborg ofborg bot requested review from flokli and puckipedia April 7, 2023 07:33
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Apr 7, 2023
@ghost ghost marked this pull request as draft April 7, 2023 07:47
@ghost ghost marked this pull request as ready for review April 7, 2023 07:50
@ghost ghost requested a review from flokli April 7, 2023 07:50
Adam Joseph added 3 commits June 29, 2023 02:25
@ghost
Copy link
Copy Markdown
Author

ghost commented Jul 12, 2023

Rebased.

Copy link
Copy Markdown
Contributor

@doronbehar doronbehar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lastly, https://github.com/NixOS/nixpkgs/pull/225111#discussion_r1160513273 is not a good commit message :)

Comment on lines +72 to +77
substituteInPlace configure \
--replace 'pkg-config' "${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config"
substituteInPlace configure \
--replace './_check_x509_validity' 'true'
substituteInPlace configure \
--replace './_check_session_keys' 'true'
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: You can do it all in a single substituteInPlace command.

})
];

XAPIAN_CONFIG = "${xapian}/bin/xapian-config";
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't seem like it would behave well in a cross compilation...

++ lib.optional withSfsexp sfsexp;

patches = [
(fetchpatch {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Too bad upstream uses mailing lists for tracking development... I know its a lot to ask, but are you aware of any attempts to tell them about these issues? It'd be nice to add some comment just in case.

pythonPackages.sphinx # (optional) documentation -> doc/INSTALL
texinfo # (optional) documentation -> doc/INSTALL
pythonPackages.cffi
gnupg
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure the gnupg and perl in buildInputs are still needed?

cp notmuch-git $out/bin/notmuch-git
wrapProgram $out/bin/notmuch-git --prefix PATH : $out/bin:${lib.getBin git}/bin
'' + ''
mkdir -p $info
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this needed all of a sudden?

@ghost ghost closed this Oct 22, 2023
@ghost ghost deleted the pr/notmuch/cross branch October 22, 2023 05:55
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: cross-compilation Building packages on a different platform than they will be used on 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants