Fix finding cargo on NixOS #192
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
cargo on NixOS is not next to `rustc`, so it was previously not found. To address this, we search for cargo in the regular way via `find_program`, if the toolchain is not managed by rustup. Closes corrosion-rs#145
ogoffart
approved these changes
Jul 23, 2022
jonringer-comm
pushed a commit
to CommE2E/comm
that referenced
this pull request
Aug 24, 2022
Summary: Having `rustc` on PATH makes corrosion assume that it will be able to find `cargo` at the same directory. This isn't true for nix. The fix has been upstreamed to corrosion in corrosion-rs/corrosion#192 but there hasn't been a release since then. Apply patch until a new release has been cut. Depends on D4872 Test Plan: ``` nix develop cd services/tunnelbroker rm -rf build && mkdir -p build && cd build && cmake .. && make -j ``` Reviewers: max, atul, O1 Nix, varun, abosh Reviewed By: O1 Nix, varun Subscribers: ashoat, tomek, abosh Differential Revision: https://phab.comm.dev/D4928
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.
cargo on NixOS is not next to
rustc, so it was previously not found.To address this, we search for cargo in the regular way via
find_program, if the toolchain is not managed by rustup.Closes #145