Skip to content

Provide cargo rust-gpu env to nix devs #3027

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.

Sign up for GitHub

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Provide cargo rust-gpu env to nix devs #3027

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c910907
Try providing cargo-rust-gpu to nix devs
timon-schelling Aug 7, 2025
ea8bd57
Try providing cargo-rust-gpu to nix devs
timon-schelling Aug 7, 2025
6ca7587
Add exec with rust-gpu env script to flake
timon-schelling Aug 8, 2025
b9dde9a
Merge branch 'master' into provide-cargo-rust-gpu-to-nix-devs
timon-schelling Aug 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 47 additions & 5 deletions .nix/flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,52 @@
pkgs = import nixpkgs {
inherit system overlays;
};

rustc-wasm = pkgs.rust-bin.stable.latest.default.override {

rustExtensions = [ "rust-src" "rust-analyzer" "clippy" "cargo" ];
rust = pkgs.rust-bin.stable.latest.default.override {
targets = [ "wasm32-unknown-unknown" ];
extensions = [ "rust-src" "rust-analyzer" "clippy" "cargo" ];
extensions = rustExtensions;
};

rustGPUToolchainPkg = pkgs.rust-bin.nightly."2025-06-23".default.override {
extensions = rustExtensions ++ [ "rustc-dev" "llvm-tools" ];
};
rustGPUToolchainRustPlatform = pkgs.makeRustPlatform {
cargo = rustGPUToolchainPkg;
rustc = rustGPUToolchainPkg;
};
rustc_codegen_spirv = rustGPUToolchainRustPlatform.buildRustPackage (finalAttrs: {
pname = "rustc_codegen_spirv";
version = "0-unstable-2025-08-04";
src = pkgs.fetchFromGitHub {
owner = "Rust-GPU";
repo = "rust-gpu";
rev = "df1628a032d22c864397417c2871b74d602af986";
hash = "sha256-AFt3Nc+NqK8DxNUhDBcOUmk3XDVcoToVeFIMYNszdbY=";
};
cargoHash = "sha256-en3BYJWQabH064xeAwYQrvcr6EuWg/QjvsG+Jd6HHCk";
cargoBuildFlags = [ "-p" "rustc_codegen_spirv" "--features=use-installed-tools" "--no-default-features" ];
doCheck = false;
});

# Wrapper script for running rust commands with the rust toolchain used by rust-gpu.
# For example `rust-gpu cargo --version` or `rust-gpu rustc --version`.
execWithRustGPUEnvironment = pkgs.writeShellScriptBin "rust-gpu" ''
#!${pkgs.lib.getExe pkgs.bash}

filtered_args=()
for arg in "$@"; do
case "$arg" in
+nightly|+nightly-*) ;;
*) filtered_args+=("$arg") ;;
esac
done

export PATH="${pkgs.lib.makeBinPath [ rustGPUToolchainPkg pkgs.spirv-tools ]}:$PATH"
export RUSTC_CODEGEN_SPIRV_PATH="${rustc_codegen_spirv}/lib/librustc_codegen_spirv.so"

exec ${"\${filtered_args[@]}"}
'';

libcef = pkgs.libcef.overrideAttrs (finalAttrs: previousAttrs: {
version = "138.0.26";
Expand All @@ -51,7 +92,6 @@
strip $out/lib/*
'';
});

libcefPath = pkgs.runCommand "libcef-path" {} ''
mkdir -p $out

Expand Down Expand Up @@ -79,7 +119,7 @@

# Development tools that don't need to be in LD_LIBRARY_PATH
buildTools = [
rustc-wasm
rust
pkgs.nodejs
pkgs.nodePackages.npm
pkgs.binaryen
Expand All @@ -91,6 +131,8 @@

# Linker
pkgs.mold

execWithRustGPUEnvironment
];
# Development tools that don't need to be in LD_LIBRARY_PATH
devTools = with pkgs; [
Expand Down