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

fix passing autodeps env to packages
Some checks failed
CI / checks (push) Failing after 17s
Details

Browse source
This commit is contained in:
Robin Appelman 2025-03-22 14:17:24 +01:00
commit 2d3f2b2ea3
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
mill-scale.nix
View file

@ -147,12 +147,14 @@ in
stdenvNoCC,
...
} @ prev: rec {
commonCraneArgs = {
commonCraneArgs =
{
src = filteredSrc;
strictDeps = true;
doCheck = false;
inherit ((buildDeps final)) buildInputs nativeBuildInputs;
};
}
// (buildDeps final).env;
allFeaturesCraneArgs =
commonCraneArgs
// {
@ -225,7 +227,8 @@ in
inherit cargoArtifacts;
meta = defaultMeta;
}
// (config.packageOpts pkgs));
// (config.packageOpts pkgs)
// (buildDeps pkgs).env);
})
// (genAttrs config.crossTargets (
target: {
@ -254,6 +257,7 @@ in
}
// crossArgs
// (config.packageOpts pkgs))
// (buildDeps pkgs).env
));
outputs = {
@ -281,7 +285,7 @@ in
pkgs,
...
}: let
packageOpts = config.packageOpts pkgs;
packageOpts = config.packageOpts pkgs // (buildDeps pkgs).env;
in
{
clippy = craneLib.cargoClippy (commonCraneArgs