b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #214937 from hercules-ci/support-NIX_ATTRS-envs

Browse source
This commit is contained in:
Artturi 2023-02-06 20:59:10 +02:00 committed by GitHub
parent acc47db7e6 afef6588e2
commit aa7d2fe7dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/stdenv/generic/setup.sh
View file

@ -28,10 +28,16 @@ if [ -n "$__structuredAttrs" ]; then
# ex: out=/nix/store/...
export "$outputName=${outputs[$outputName]}"
done
# $NIX_ATTRS_JSON_FILE points to the wrong location in sandbox
# https://github.com/NixOS/nix/issues/6736
export NIX_ATTRS_JSON_FILE="$NIX_BUILD_TOP/.attrs.json"
export NIX_ATTRS_SH_FILE="$NIX_BUILD_TOP/.attrs.sh"
# $NIX_ATTRS_JSON_FILE pointed to the wrong location in sandbox
# https://github.com/NixOS/nix/issues/6736; please keep around until the
# 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
: "${outputs:=out}"
fi