From 32b7aa65e67659c3ee318aae8144b26f61dee136 Mon Sep 17 00:00:00 2001 From: Callum Leslie Date: Mon, 15 Sep 2025 10:07:42 +0100 Subject: [PATCH] fix: correct toolchain in flake --- flake.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index a6030b1..06a1c34 100644 --- a/flake.nix +++ b/flake.nix @@ -20,11 +20,17 @@ flake-utils.lib.eachDefaultSystem (system: let overlays = [(import rust-overlay)]; pkgs = import nixpkgs {inherit system overlays;}; - rustToolchain = pkgs.pkgsBuildHost.rust-bin.stable.latest.default; + rustToolchain = pkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml; + rustToolchainNightly = pkgs.pkgsBuildHost.rust-bin.nightly.latest.default; tools = with pkgs; [cargo-nextest]; - nativeBuildInputs = with pkgs; [rustToolchain pkg-config] ++ tools; + nativeBuildInputs = with pkgs; [rustToolchain rustToolchainNightly pkg-config] ++ tools; in with pkgs; { - devShells.default = mkShell {inherit nativeBuildInputs;}; + devShells.default = mkShell { + inherit nativeBuildInputs; + shellHook = '' + export CARGO_NIGHTLY="${rustToolchainNightly}/bin/cargo" + ''; + }; }); }