stdenvs: Distinguish between extraBuildInputs and extraNativeBuildInputs

Additionally, instead of pulling them from `setup.sh`, route them via
Nix. This gets us one step closer to making stdenv be a plain attribute
set instead of a derivation.
This commit is contained in:
John Ericson
2017-08-15 18:24:54 -04:00
parent a71cf06b16
commit eeabf85780
7 changed files with 47 additions and 28 deletions
+2 -3
View File
@@ -317,18 +317,17 @@ if [ -z "$crossConfig" ]; then
# are handled identically to nativeBuildInputs
declare -a nativePkgs
for i in $nativeBuildInputs $buildInputs \
$defaultNativeBuildInputs $defaultBuildInputs \
$propagatedNativeBuildInputs $propagatedBuildInputs; do
findInputs "$i" nativePkgs propagated-native-build-inputs
done
else
declare -a crossPkgs
for i in $buildInputs $defaultBuildInputs $propagatedBuildInputs; do
for i in $buildInputs $propagatedBuildInputs; do
findInputs "$i" crossPkgs propagated-build-inputs
done
declare -a nativePkgs
for i in $nativeBuildInputs $defaultNativeBuildInputs $propagatedNativeBuildInputs; do
for i in $nativeBuildInputs $propagatedNativeBuildInputs; do
findInputs "$i" nativePkgs propagated-native-build-inputs
done
fi