Skip to content

Shaders: graster-nodes no-std fixups #2984

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

Merged
merged 4 commits into from
Aug 6, 2025
Merged

Shaders: graster-nodes no-std fixups #2984

merged 4 commits into from
Aug 6, 2025

Conversation

Firestar99
Copy link
Collaborator

No description provided.

@timon-schelling
Copy link
Collaborator

timon-schelling commented Aug 4, 2025

From what I can tell, your change to the nix flake makes the rust install non declarative and non reproduceable. Which tool does cargo-gpu require?

@Keavon
Copy link
Member

Keavon commented Aug 4, 2025

Before this merges, could a real/descriptive name for the PR be added please?

@Firestar99 Firestar99 changed the title Shaders prep2 Shaders: graster-nodes no-std fixups Aug 4, 2025
@Firestar99
Copy link
Collaborator Author

Firestar99 commented Aug 4, 2025

@timon-schelling cargo-gpu assumes you installed rust via rustup and does the following:

  • uses rustup to check if a toolchain is installed, and if not install it
  • uses rustup to check if a list of components is installed for set toolchain, and if not install it
  • uses cargo +toolchain to select a certain toolchain for cargo commands

The rust overlay we're currently using is not based upon rustup, and instead links cargo directly to the cargo of the toolchain specified within nix. So cargo +toolchain fails with cargo complaining that you should call it through rustup.

Just using rustup is the easiest way to resolve it. But if you have an idea on how to install two parallel toolchains and switch between them, feel free to take this one over.

@timon-schelling
Copy link
Collaborator

I will take a look how we can do the same thing declaratively. :) In the meantime please do not include your flake changes in this PR.

@Firestar99
Copy link
Collaborator Author

Rebased it and excluded the nix commit, that one will be merged whenever #2985 is ready. @Keavon @TrueDoctor which makes this PR ready for review and merge

@TrueDoctor TrueDoctor enabled auto-merge (squash) August 6, 2025 13:34
@TrueDoctor TrueDoctor merged commit caa228a into master Aug 6, 2025
4 checks passed
@TrueDoctor TrueDoctor deleted the shaders-prep2 branch August 6, 2025 14:10
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.

4 participants