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:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user