Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rustPlatform: fix bug with ambiguous diff tool #87155

Merged
merged 1 commit into from
May 7, 2020
Merged

Conversation

bhipple
Copy link
Contributor

@bhipple bhipple commented May 7, 2020

If a user provides nativeBuildInputs = [ llvmPackages.bintools ] or any other
package containing a ${prefix}/bin/diff, the builder could use it instead
of the standard unix diff, causing a build failure.

This updates the call to specify an abspath to diff and avoid reliance on PATH.

Resolves #87081

If a user provides `nativeBuildInputs = [ llvmPackages.bintools ]` or any other
package containing a `${prefix}/bin/diff`, the builder could use it instead
of the standard unix `diff`, causing a build failure.

This updates the call to specify an abspath to `diff` and avoid reliance on `PATH`.

Resolves NixOS#87081
@bhipple bhipple requested a review from andir as a code owner May 7, 2020 01:06
@bhipple
Copy link
Contributor Author

bhipple commented May 7, 2020

@GrahamcOfBorg build ripgrep

CC @jonringer @zimbatm

@Mic92 Mic92 merged commit 68b25d3 into NixOS:staging May 7, 2020
@bhipple bhipple deleted the fix/rust branch June 2, 2020 22:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants