Skip to content

Commit 29117d3

Browse files
SyndamiaPetarKirov
authored andcommitted
fix(pkgs/nexus): Add riscv target to Rust toolchain
1 parent d4ad50a commit 29117d3

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

packages/all-packages.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@
141141

142142
args-zkVM = {
143143
rustFromToolchainFile = inputs'.fenix.packages.fromToolchainFile;
144+
fenix = inputs'.fenix.packages;
144145
inherit craneLib;
145146
inherit installSourceAndCargo;
146147
};

packages/nexus/default.nix

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
fenix,
23
rustFromToolchainFile,
34
craneLib,
45
fetchFromGitHub,
@@ -30,10 +31,17 @@ let
3031
};
3132
};
3233

33-
rust-toolchain = rustFromToolchainFile {
34-
dir = commonArgs.src;
35-
sha256 = "sha256-J0fzDFBqvXT2dqbDdQ71yt2/IKTq4YvQs6QCSkmSdKY=";
36-
};
34+
rust-toolchain =
35+
let
36+
toolchain = {
37+
dir = commonArgs.src;
38+
sha256 = "sha256-J0fzDFBqvXT2dqbDdQ71yt2/IKTq4YvQs6QCSkmSdKY=";
39+
};
40+
in
41+
fenix.combine [
42+
(rustFromToolchainFile toolchain)
43+
(fenix.targets.riscv32i-unknown-none-elf.fromToolchainFile toolchain)
44+
];
3745
crane = craneLib.overrideToolchain rust-toolchain;
3846
cargoArtifacts = crane.buildDepsOnly commonArgs;
3947
in

0 commit comments

Comments
 (0)