Support pre-20.03 Nixpkgs #234
Open
Conversation
This file contains hidden or 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
toRustTarget was added in https://github.com/nixos/nixpkgs/commits/83ac9c07e4df352e177ebdf978320089a137183a So not all nixpkgs have it. We can provide a backup of it in this case. Fixes mozilla#232
lf-
suggested changes
Aug 10, 2020
lf-
left a comment
lf-
left a comment
There was a problem hiding this comment.
undefined variable 'lib' at /nix/store/3spd0g7vp1n81ccnydfrvqackfpgbajc-nixpkgs-mozilla-src/rust-overlay.nix:83:48
rust-overlay.nix
Outdated
| "armv6l" = "arm"; | ||
| }.${cpu.name} or platform.rustc.arch or cpu.name; | ||
| in platform.rustc.config | ||
| or "${cpu_}-${vendor.name}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}"); |
There was a problem hiding this comment.
this needs to be super.lib.optionalString, not lib.optionalString
|
This isn't quite right. I have committed a tested and working fix in 3ae360a. |
Contributor
Author
Thanks! |
lf-
approved these changes
Aug 18, 2020
|
I’d appreciate this landing since I’m running into this. Any chance? :-) |
nbp
reviewed
Jul 29, 2021
| "armv7a" = "armv7"; | ||
| "armv7l" = "armv7"; | ||
| "armv6l" = "arm"; | ||
| }.${cpu.name} or platform.rustc.arch or cpu.name; |
Collaborator
There was a problem hiding this comment.
Q: Any reason to add platform.rustc.arch as opposed to what is currently implemented in Nixpkgs
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
toRustTarget was added in https://github.com/nixos/nixpkgs/commits/83ac9c07e4df352e177ebdf978320089a137183a
So not all nixpkgs have it. We can provide a backup of it in this
case.
Fixes #232