diff options
| -rw-r--r-- | flake.nix | 6 | ||||
| -rw-r--r-- | zkvms/zkm/default.nix | 2 | ||||
| -rw-r--r-- | zkvms/zkwasm/default.nix | 16 |
3 files changed, 16 insertions, 8 deletions
@@ -13,19 +13,19 @@ "github:metacraft-labs/nix-blockchain-development?rev=f717747a4ce11d5764578d8ee1c505d00bf8a81e"; nixpkgs.follows = "mcl-blockchain/nixpkgs"; crane.follows = "mcl-blockchain/crane"; - rust-overlay.follows = "mcl-blockchain/rust-overlay"; + fenix.follows = "mcl-blockchain/fenix"; # flake-utils.follows = "mcl-blockchain/flake-utils"; }; outputs = { self, nixpkgs, mcl-blockchain, mcl-blockchain-old, crane - , rust-overlay, ... }: + , fenix, ... }: let system = "x86_64-linux"; pkgs = import nixpkgs { system = system; overlays = [ mcl-blockchain.overlays.default - rust-overlay.overlays.default + fenix.overlays.default (_: _: { metacraft-labs-old = mcl-blockchain-old.legacyPackages.${system}.metacraft-labs; diff --git a/zkvms/zkm/default.nix b/zkvms/zkm/default.nix index 7fc52f6..4b4cfe2 100644 --- a/zkvms/zkm/default.nix +++ b/zkvms/zkm/default.nix @@ -1,4 +1,4 @@ -{ zkvmLib, lib, just, metacraft-labs, metacraft-labs-old, rust-bin, protobuf +{ zkvmLib, lib, just, metacraft-labs, metacraft-labs-old, protobuf , pkg-config, openssl, buildGoModule, fetchFromGitHub, craneLib-default, }: let zkm_libsnark = buildGoModule rec { diff --git a/zkvms/zkwasm/default.nix b/zkvms/zkwasm/default.nix index 88947ba..e78d721 100644 --- a/zkvms/zkwasm/default.nix +++ b/zkvms/zkwasm/default.nix @@ -1,4 +1,4 @@ -{ zkvmLib, lib, rust-bin, metacraft-labs, wasm-pack, wasm-bindgen-cli, binaryen +{ zkvmLib, lib, fenix, metacraft-labs, wasm-pack, wasm-bindgen-cli, binaryen , craneLib-default, stdenv, }: let commonArgs = rec { @@ -13,9 +13,17 @@ let }; }; - rust-toolchain = rust-bin.nightly."2024-04-09".default.override { - targets = [ "wasm32-unknown-unknown" ]; - }; + rust-toolchain = let + toolchain-arg = { + channel = "nightly"; + date = "2024-04-09"; + sha256 = "sha256-Pf/EIA/M8/JpX7naMcutqBajVwhZoqrPkkyBwho6dyI="; + }; + in with fenix; combine [ + (toolchainOf toolchain-arg).minimalToolchain + (targets.wasm32-unknown-unknown.toolchainOf toolchain-arg).toolchain + ]; + craneLib = craneLib-default.overrideToolchain rust-toolchain; cargoArtifacts = zkvmLib.buildDepsOnly craneLib commonArgs; in zkvmLib.buildPackage craneLib (commonArgs // { |