csound: fix cross with gettext hack #227135
Merged
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
lilyinstarlight
added
the
6.topic: cross-compilation
ofborg
bot
added
10.rebuild-darwin: 0
Merged
12 tasks
Mindavi
approved these changes
May 9, 2023
mweinelt
added
the
12.approvals: 1
|
Rebased to fix merge conflict after #230329 |
lilyinstarlight
force-pushed
the
fix/csound-cross
branch
from
8e7ad51 to
054e6bd
Compare
We need to ignore gettext in CMAKE_PREFIX_PATH on cross to prevent `find_program` from picking up the wrong gettext. See the `webkitgtk` and `fish` derivations for similar hacks (though this really should eventually be fixed at a lower level). The wrong gettext in this case is getting pulled in via: csound(host) -> fluidsynth(host) -> glib(host) -> gettext(host)
lilyinstarlight
force-pushed
the
fix/csound-cross
branch
from
054e6bd to
9f75fd7
Compare
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.
Description of changes
We need to ignore
gettextinCMAKE_PREFIX_PATHwhen cross-compiling to preventfind_programfrom picking up the wronggettext. See thewebkitgtkandfishderivations for similar hacks (though this really should eventually be fixed at a lower level). The wrong gettext in this case is getting pulled in via:csound(host) -> fluidsynth(host) -> glib(host) -> gettext(host-propagated)This change should be zero rebuilds for non-cross
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)