nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 18:33:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "setup.sh: fatal: This word should yield a string, but it contains an array"

Browse Source 
This reverts commit bf99a819a1.
It caused regressions in some packages; see:
https://github.com/NixOS/nixpkgs/commit/bf99a819a160
This commit is contained in:
Vladimír Čunát 2021-07-11 16:02:17 +02:00
parent 3ea417e47f
commit 6f239d7309
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -368,13 +368,16 @@ findInputs() {
local var="${!varRef}" local var="${!varRef}"
unset -v varVar varRef unset -v varVar varRef
# var is a reference to an array and can sometimes be undefined # TODO(@Ericson2314): Restore using associative array once Darwin
# so checking the array with "${!var}[@]" does not work # nix-shell doesn't use impure bash. This should replace the O(n)
# check if $pkgs is in the var ref array # case with an O(1) hash map lookup, assuming bash is implemented
# TODO(@Ericson2314): Restore using associative array # well :D.
if [[ "${var}[*]" = *" $pkg "* ]]; then local varSlice="${var}[*]"
return 0 # ${..-} to hack around old bash empty array problem
fi case "${!varSlice-}" in
*" $pkg "*) return 0 ;;
esac
unset -v varSlice
eval "$var"'+=("$pkg")' eval "$var"'+=("$pkg")'