|
50 | 50 | rustc = rustNightlyPkg;
|
51 | 51 | };
|
52 | 52 |
|
53 |
| - rustc_codegen_spirv = (rustPlatformNightly.buildRustPackage.override { |
54 |
| - stdenv = pkgs.llvmPackages.stdenv; |
55 |
| - }) (finalAttrs: { |
| 53 | + rustc_codegen_spirv = rustPlatformNightly.buildRustPackage (finalAttrs: { |
56 | 54 | pname = "rustc_codegen_spirv";
|
57 | 55 | version = "0-unstable-2025-08-04";
|
58 | 56 | src = pkgs.fetchFromGitHub {
|
|
63 | 61 | };
|
64 | 62 | cargoHash = "sha256-en3BYJWQabH064xeAwYQrvcr6EuWg/QjvsG+Jd6HHCk";
|
65 | 63 |
|
66 |
| - cargoBuildFlags = [ "-p" "rustc_codegen_spirv" ]; |
| 64 | + cargoBuildFlags = [ "-p" "rustc_codegen_spirv" "--features=use-installed-tools" "--no-default-features" ]; |
67 | 65 |
|
68 | 66 | doCheck = false;
|
69 | 67 | });
|
70 | 68 |
|
71 |
| - cargoRustGpuBuild = pkgs.writeShellScriptBin "cargo-rust-gpu" '' |
| 69 | + cargoGpuPkg = rustPlatformNightly.buildRustPackage (finalAttrs: { |
| 70 | + pname = "cargo-gpu"; |
| 71 | + version = "0-unstable-2025-07-24"; |
| 72 | + src = pkgs.fetchFromGitHub { |
| 73 | + owner = "Rust-GPU"; |
| 74 | + repo = "cargo-gpu"; |
| 75 | + rev = "a2ad3574dd32142ff661994e0d79448a45d18f47"; |
| 76 | + hash = "sha256-YGu9Cuw+pcN9/rCuCxImouzsQ3ScHF+cW6zgxMm0XGI="; |
| 77 | + }; |
| 78 | + cargoHash = "sha256-tyad9kO90uwAnMQYa09takIBXifrumSx2C4rpSK95aM="; |
| 79 | + |
| 80 | + doCheck = false; |
| 81 | + }); |
| 82 | + |
| 83 | + cargoNightlyPkg = pkgs.writeShellScriptBin "cargo-nightly" '' |
72 | 84 | #!${pkgs.bash}/bin/bash
|
73 | 85 |
|
74 |
| - export PATH="${pkgs.lib.makeBinPath [rustNightlyPkg]}" |
75 |
| - export RUSTFLAGS="-Zcodegen-backend=${rustc_codegen_spirv}/lib/librustc_codegen_spirv.so" |
76 |
| - exec cargo +nightly $@ |
| 86 | + exec ${rustNightlyPkg}/bin/cargo $@ |
77 | 87 | '';
|
78 | 88 |
|
| 89 | + |
79 | 90 | libcef = pkgs.libcef.overrideAttrs (finalAttrs: previousAttrs: {
|
80 | 91 | version = "139.0.17";
|
81 | 92 | gitRevision = "6c347eb";
|
|
135 | 146 | # Linker
|
136 | 147 | pkgs.mold
|
137 | 148 |
|
138 |
| - cargoRustGpuBuild |
| 149 | + pkgs.spirv-tools |
| 150 | + cargoNightlyPkg |
| 151 | + cargoGpuPkg |
139 | 152 | ];
|
140 | 153 | # Development tools that don't need to be in LD_LIBRARY_PATH
|
141 | 154 | devTools = with pkgs; [
|
|
158 | 171 | CEF_PATH = libcefPath;
|
159 | 172 | XDG_DATA_DIRS="${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}:${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}:$XDG_DATA_DIRS";
|
160 | 173 |
|
| 174 | + RUSTC_CODEGEN_SPIRV="${rustc_codegen_spirv}/lib/librustc_codegen_spirv.so"; |
| 175 | + |
161 | 176 | shellHook = ''
|
162 | 177 | alias cargo='mold --run cargo'
|
163 | 178 | '';
|
|
0 commit comments