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.
Motivation for this change
Rust cross compilation to windows broke in 9171853 because the vendor component in the target triplet/"quadlet" was changed from
pc
tow64
. Rust still usespc
so this PR just adds this replacement to thetoRustTarget
function in the spirit of #66613, which seems to have first introduced the idea of target component replacement.You can test this using the following derivation, which should not evaluate before this change and successfully build after it.
The expected error is:
The repro snippet:
(I'm using the nixpkgs-mozilla overlay because building the rust tools in nixpkgs OOMs on my machine)
There is probably more work ahead to make cross compilation work the way it should, see #68804.
I also removed the unused dependency on
remarshal
.Things done
nixpkgs-review rev HEAD
./result/bin/
)