Skip to content

Support pre-20.03 Nixpkgs#234

Open
matthewbauer wants to merge 2 commits intomozilla:masterfrom
matthewbauer:fix-with-older-nixpkgs
Open

Support pre-20.03 Nixpkgs#234
matthewbauer wants to merge 2 commits intomozilla:masterfrom
matthewbauer:fix-with-older-nixpkgs

Conversation

@matthewbauer
Copy link
Copy Markdown
Contributor

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

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
Copy link
Copy Markdown

@lf- lf- left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

undefined variable 'lib' at /nix/store/3spd0g7vp1n81ccnydfrvqackfpgbajc-nixpkgs-mozilla-src/rust-overlay.nix:83:48

Comment thread 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}"}");
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this needs to be super.lib.optionalString, not lib.optionalString

@lf-
Copy link
Copy Markdown

lf- commented Aug 10, 2020

This isn't quite right. I have committed a tested and working fix in 3ae360a.

@matthewbauer
Copy link
Copy Markdown
Contributor Author

This isn't quite right. I have committed a tested and working fix in 3ae360a.

Thanks!

@eugeneia
Copy link
Copy Markdown

I’d appreciate this landing since I’m running into this. Any chance? :-)

Comment thread rust-overlay.nix
"armv7a" = "armv7";
"armv7l" = "armv7";
"armv6l" = "arm";
}.${cpu.name} or platform.rustc.arch or cpu.name;
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Missing toRustTarget in rust-overlay

4 participants