robin/mill-scale
1
0
Fork 0
mirror of https://codeberg.org/icewind/mill-scale.git synced 2026-06-03 09:54:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

read rust-toolchain.toml

Browse source
This commit is contained in:
Robin Appelman 2025-03-23 19:47:57 +01:00
commit 24ac68bfd0
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
mill-scale.nix
View file

@ -39,6 +39,12 @@
LD_LIBRARY_PATH = "/run/opengl-driver/lib/:${lib.makeLibraryPath runtimeInputs}"; LD_LIBRARY_PATH = "/run/opengl-driver/lib/:${lib.makeLibraryPath runtimeInputs}";
}; };
}; };
defaultToolchain = pkgs:
if pathExists (src + "/rust-toolchain.toml")
then pkgs.rust-bin.fromRustupToolchainFile (src + "/rust-toolchain.toml")
else pkgs.rust-bin.stable.latest.default;
autoTools = let autoTools = let
definitions = import ./autotools.nix; definitions = import ./autotools.nix;
perDependency = map (dep: definitions.${dep} or []) (cargoMeta.dependencies ++ cargoMeta.dev-dependencies); perDependency = map (dep: definitions.${dep} or []) (cargoMeta.dependencies ++ cargoMeta.dev-dependencies);
@ -112,7 +118,7 @@ in
}; };
toolchain = mkOption { toolchain = mkOption {
type = function; type = function;
default = pkgs: pkgs.rust-bin.stable.latest.default; default = defaultToolchain;
description = "rust toolchain to use"; description = "rust toolchain to use";
}; };
msrvToolchain = mkOption { msrvToolchain = mkOption {