notmuch: fix cross #225111
Closed
notmuch: fix cross #225111
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ofborg
bot
added
the
6.topic: cross-compilation
flokli
reviewed
Apr 7, 2023
ghost
marked this pull request as draft
ghost
marked this pull request as ready for review
added 3 commits
June 29, 2023 02:25
Adapted from Void Linux commit 81c3c1884be1959337b55cd88d4748d17ac6c3de.
|
Rebased. |
doronbehar
requested changes
Sep 9, 2023
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' |
There was a problem hiding this comment.
Nit: You can do it all in a single substituteInPlace command.
| }) | ||
| ]; | ||
|
|
||
| XAPIAN_CONFIG = "${xapian}/bin/xapian-config"; |
There was a problem hiding this comment.
This doesn't seem like it would behave well in a cross compilation...
| @@ -40,6 +47,19 @@ stdenv.mkDerivation rec { | |||
| ] ++ lib.optional withRuby ruby | |||
| ++ lib.optional withSfsexp sfsexp; | |||
|
|
|||
| patches = [ | |||
| (fetchpatch { | |||
There was a problem hiding this comment.
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.
| @@ -28,6 +33,8 @@ stdenv.mkDerivation rec { | |||
| pythonPackages.sphinx # (optional) documentation -> doc/INSTALL | |||
| texinfo # (optional) documentation -> doc/INSTALL | |||
| pythonPackages.cffi | |||
| gnupg | |||
There was a problem hiding this comment.
Are you sure the gnupg and perl in buildInputs are still needed?
| @@ -124,6 +152,8 @@ stdenv.mkDerivation rec { | |||
| + lib.optionalString withSfsexp '' | |||
| cp notmuch-git $out/bin/notmuch-git | |||
| wrapProgram $out/bin/notmuch-git --prefix PATH : $out/bin:${lib.getBin git}/bin | |||
| '' + '' | |||
| mkdir -p $info | |||
There was a problem hiding this comment.
Why is this needed all of a sudden?
ghost
closed this
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adapted from Void Linux commit 81c3c1884be1959337b55cd88d4748d17ac6c3de and f95b944252e3a1fc900a18c8eeed59e6de9b6e9a.
Note:
withEmacswill be disabled automatically due to