From 6ba07d6f0b68febae55df3bdb1e2b83d7d0c2a14 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Thu, 7 May 2026 01:40:05 +0900 Subject: [PATCH] flake.nix: use crane's toolchains for crane builds --- flake.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 69d9c61..753f50f 100644 --- a/flake.nix +++ b/flake.nix @@ -64,12 +64,12 @@ ])) ./.; cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml); - in forAllSystems (system: pkgs: toolchain: let - craneLib = (crane.mkLib pkgs).overrideToolchain (p: toolchain); + in forAllSystems (system: pkgs: _: let + craneLib = (crane.mkLib pkgs).overrideToolchain (p: p.rust-bin.stable.latest.default); in { - default = self.packages.${system}.tamerye-shared-lib; + default = self.packages.${system}.tamerye-shared-lib-crane; - tamerye-shared-lib = craneLib.buildPackage { + tamerye-shared-lib-crane = craneLib.buildPackage { pname = "tamerye-shared-lib"; version = cargoToml.package.version; inherit src; @@ -83,7 +83,7 @@ }; }; - tamerye-static-lib = craneLib.buildPackage { + tamerye-static-lib-crane = craneLib.buildPackage { pname = "tamerye-static-lib"; version = cargoToml.package.version; inherit src; @@ -111,7 +111,7 @@ cargoExtraArgs = lib.escapeShellArgs [ "--features" "static" ]; }; - tamerye-tests = craneLib.cargoNextest { + tamerye-tests-crane = craneLib.cargoNextest { pname = "tamerye-tests"; version = cargoToml.package.version; inherit src;