stdenv: cleanup after bump of minver (#433055)

authored by philiptaron.tngl.sh and committed by GitHub 6ed3b21f e821b847

+4 -14
+1 -1
pkgs/build-support/testers/expect-failure.sh
··· 41 41 # 42 42 # NOTE: This MUST be done after the original builder has finished! 43 43 # Otherwise we could pollute its environment. 44 - if [ -e "${NIX_ATTRS_SH_FILE:-}" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi 44 + if [ -e "${NIX_ATTRS_SH_FILE:-}" ]; then . "$NIX_ATTRS_SH_FILE"; fi 45 45 46 46 # Variables injected by replaceVars 47 47 #
+1 -1
pkgs/stdenv/generic/make-derivation.nix
··· 847 847 "-c" 848 848 '' 849 849 out="${placeholder "out"}" 850 - if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi 850 + if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; fi 851 851 declare -p > $out 852 852 for var in $passAsFile; do 853 853 pathVar="''${var}Path"
+1 -11
pkgs/stdenv/generic/setup.sh
··· 25 25 set -x 26 26 fi 27 27 28 - if [ -f .attrs.sh ] || [[ -n "${NIX_ATTRS_JSON_FILE:-}" ]]; then 28 + if [[ -n "${NIX_ATTRS_JSON_FILE:-}" ]]; then 29 29 __structuredAttrs=1 30 30 echo "structuredAttrs is enabled" 31 31 ··· 33 33 # ex: out=/nix/store/... 34 34 export "$outputName=${outputs[$outputName]}" 35 35 done 36 - 37 - # $NIX_ATTRS_JSON_FILE pointed to the wrong location in sandbox 38 - # https://github.com/NixOS/nix/issues/6736; please keep around until the 39 - # fix reaches *every patch version* that's >= lib/minver.nix 40 - if ! [[ -e "${NIX_ATTRS_JSON_FILE:-}" ]]; then 41 - export NIX_ATTRS_JSON_FILE="$NIX_BUILD_TOP/.attrs.json" 42 - fi 43 - if ! [[ -e "${NIX_ATTRS_SH_FILE:-}" ]]; then 44 - export NIX_ATTRS_SH_FILE="$NIX_BUILD_TOP/.attrs.sh" 45 - fi 46 36 else 47 37 __structuredAttrs= 48 38 : "${outputs:=out}"
+1 -1
pkgs/stdenv/generic/source-stdenv.sh
··· 1 - if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi 1 + if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; fi 2 2 source "$stdenv/setup" 3 3 source "$1"