mirror of
https://github.com/nix-community/naersk
synced 2024-11-23 04:03:04 +00:00
Pass cargolock/cargotoml via file instead of via env var
Apparently the cargolock env var can become too big so we replace it with a file. This fixes the following error: building '/nix/store/s8bv90acizsyvh1s9gk7yvpiyw2gcpnx-dfinity-application-and-others-deps.drv'... while setting up the build environment: executing '/nix/store/cinw572b38aln37glr0zb8lxwrgaffl4-bash-4.4-p23/bin/bash': Argument list too long See the following on the background of why env vars can become too big: https://stackoverflow.com/questions/28865473/setting-environment-variable-to-a-large-value-argument-list-too-long
This commit is contained in:
parent
f4773e30aa
commit
8d59785ca6
2 changed files with 5 additions and 5 deletions
|
@ -122,7 +122,7 @@ with rec
|
||||||
then
|
then
|
||||||
echo "WARNING: replacing existing Cargo.lock"
|
echo "WARNING: replacing existing Cargo.lock"
|
||||||
fi
|
fi
|
||||||
echo "$cargolock" > Cargo.lock
|
install -m 644 "$cargolock" Cargo.lock
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -n "$cargotoml" ]
|
if [ -n "$cargotoml" ]
|
||||||
|
@ -132,7 +132,7 @@ with rec
|
||||||
then
|
then
|
||||||
echo "WARNING: replacing existing Cargo.toml"
|
echo "WARNING: replacing existing Cargo.toml"
|
||||||
fi
|
fi
|
||||||
echo "$cargotoml" > Cargo.toml
|
install -m 644 "$cargotoml" Cargo.toml
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mkdir -p target
|
mkdir -p target
|
||||||
|
@ -245,9 +245,9 @@ with rec
|
||||||
'';
|
'';
|
||||||
} //
|
} //
|
||||||
lib.optionalAttrs (! isNull cargolock )
|
lib.optionalAttrs (! isNull cargolock )
|
||||||
{ cargolock = builtinz.toTOML cargolock; } //
|
{ cargolock = builtinz.writeTOML "Cargo.lock" cargolock; } //
|
||||||
lib.optionalAttrs (! isNull cargotoml )
|
lib.optionalAttrs (! isNull cargotoml )
|
||||||
{ cargotoml = builtinz.toTOML cargotoml; }
|
{ cargotoml = builtinz.writeTOML "Cargo.toml" cargotoml; }
|
||||||
)
|
)
|
||||||
;
|
;
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
rec
|
rec
|
||||||
{
|
{
|
||||||
toTOML = import ./to-toml.nix { inherit lib; };
|
toTOML = import ./to-toml.nix { inherit lib; };
|
||||||
writeTOML = attrs: writeText "write-toml" (toTOML attrs);
|
writeTOML = name: attrs: writeText name (toTOML attrs);
|
||||||
|
|
||||||
readTOML = usePure: f:
|
readTOML = usePure: f:
|
||||||
if usePure then
|
if usePure then
|
||||||
|
|
Loading…
Reference in a new issue