public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stdenv/setup.sh: undo local -n change

Browse Source 
It's better than the eval solution this is adding back, but until we can
rely on a particular version of bash in nix-shell, this just breaks too
much stuff.

See c94f3d5575
and https://github.com/NixOS/nix/pull/1483 for the better long-term
solution.
This commit is contained in:
Dan Peebles 2017-07-24 13:09:32 -04:00
parent 1dd6e7dcbc
commit 2829ea57cb
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/stdenv/generic/setup.sh
View File

@ -17,9 +17,10 @@ runHook() {
shift shift
local var="$hookName" local var="$hookName"
if [[ "$hookName" =~ Hook$ ]]; then var+=s; else var+=Hooks; fi if [[ "$hookName" =~ Hook$ ]]; then var+=s; else var+=Hooks; fi
local -n var
eval "local -a dummy=(\"\${$var[@]}\")"
local hook local hook
for hook in "_callImplicitHook 0 $hookName" "${var[@]}"; do for hook in "_callImplicitHook 0 $hookName" "${dummy[@]}"; do
_eval "$hook" "$@" _eval "$hook" "$@"
done done
return 0 return 0
@ -33,9 +34,9 @@ runOneHook() {
shift shift
local var="$hookName" local var="$hookName"
if [[ "$hookName" =~ Hook$ ]]; then var+=s; else var+=Hooks; fi if [[ "$hookName" =~ Hook$ ]]; then var+=s; else var+=Hooks; fi
local -n var eval "local -a dummy=(\"\${$var[@]}\")"
local hook local hook
for hook in "_callImplicitHook 1 $hookName" "${var[@]}"; do for hook in "_callImplicitHook 1 $hookName" "${dummy[@]}"; do
if _eval "$hook" "$@"; then if _eval "$hook" "$@"; then
return 0 return 0
fi fi