Merge pull request #214937 from hercules-ci/support-NIX_ATTRS-envs
This commit is contained in:
commit
aa7d2fe7dc
1 changed files with 10 additions and 4 deletions
|
@ -28,10 +28,16 @@ if [ -n "$__structuredAttrs" ]; then
|
||||||
# ex: out=/nix/store/...
|
# ex: out=/nix/store/...
|
||||||
export "$outputName=${outputs[$outputName]}"
|
export "$outputName=${outputs[$outputName]}"
|
||||||
done
|
done
|
||||||
# $NIX_ATTRS_JSON_FILE points to the wrong location in sandbox
|
|
||||||
# https://github.com/NixOS/nix/issues/6736
|
# $NIX_ATTRS_JSON_FILE pointed to the wrong location in sandbox
|
||||||
export NIX_ATTRS_JSON_FILE="$NIX_BUILD_TOP/.attrs.json"
|
# https://github.com/NixOS/nix/issues/6736; please keep around until the
|
||||||
export NIX_ATTRS_SH_FILE="$NIX_BUILD_TOP/.attrs.sh"
|
# fix reaches *every patch version* that's >= lib/minver.nix
|
||||||
|
if ! [[ -e "$NIX_ATTRS_JSON_FILE" ]]; then
|
||||||
|
export NIX_ATTRS_JSON_FILE="$NIX_BUILD_TOP/.attrs.json"
|
||||||
|
fi
|
||||||
|
if ! [[ -e "$NIX_ATTRS_SH_FILE" ]]; then
|
||||||
|
export NIX_ATTRS_SH_FILE="$NIX_BUILD_TOP/.attrs.sh"
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
: "${outputs:=out}"
|
: "${outputs:=out}"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue