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

Patched build.rs to run on systems without rustup. Added flake for ni… #2199

Merged
merged 2 commits into from
Dec 21, 2023

Conversation

benwis
Copy link
Contributor

@benwis benwis commented Dec 21, 2023

In order to build spin on systems without rustup, you can't use rustup to check for targets. I've replaced that check with one from rustc. If it's not installed it still fails for nix users as it can't install it, but if it is it passes at least

@itowlson
Copy link
Contributor

@benwis Could you sign off the commit (and GPG sign if not already done) please? Thanks!

Copy link
Contributor

@itowlson itowlson left a comment

Choose a reason for hiding this comment

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

I'm not qualified to review the Nix side but the build changes look fine - thanks!

Copy link
Member

@endocrimes endocrimes left a comment

Choose a reason for hiding this comment

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

mostly lgtm, I'm ooo rn but I can give this a try tonight

flake.nix Outdated
@@ -0,0 +1,39 @@

{
description = "A basic Rust devshell";
Copy link
Member

Choose a reason for hiding this comment

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

We should probably update this to reference spin, but that can be done as a follow up

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I mentioned spin in the new commit

@benwis
Copy link
Contributor Author

benwis commented Dec 21, 2023

@benwis Could you sign off the commit (and GPG sign if not already done) please? Thanks!

I will try, I haven't setup code signing before, shouldn't be too bad

…x devshell

Signed-off-by: benwis <ben@celcyon.com>
Signed-off-by: benwis <ben@celcyon.com>
@benwis
Copy link
Contributor Author

benwis commented Dec 21, 2023

@benwis Could you sign off the commit (and GPG sign if not already done) please? Thanks!

Signed!

Copy link
Member

@endocrimes endocrimes left a comment

Choose a reason for hiding this comment

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

Tested that this works correctly on linux - Darwin test is taking a longer because well... a laptop is not a server 😅 - I'll follow up with anything needed for nix-darwin builds though.

@itowlson itowlson merged commit a1a82c9 into fermyon:main Dec 21, 2023
11 checks passed
@benwis
Copy link
Contributor Author

benwis commented Dec 21, 2023

Tested that this works correctly on linux - Darwin test is taking a longer because well... a laptop is not a server 😅 - I'll follow up with anything needed for nix-darwin builds though.

Thank you!

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.

3 participants