Rename buildNativeInputs -> nativeBuildInputs

Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
This commit is contained in:
Eelco Dolstra
2012-12-28 19:20:09 +01:00
parent 5be0a9acd7
commit ab3eeabfed
363 changed files with 416 additions and 416 deletions
+3 -3
View File
@@ -63,8 +63,8 @@
mkDerivation {
# The setup.sh script from stdenv will expect the native build inputs in
# the buildNativeInputs environment variable.
buildNativeInputs = [ ] ++ buildInputs;
# the nativeBuildInputs environment variable.
nativeBuildInputs = [ ] ++ buildInputs;
# Trick to bypass the stdenv usual change of propagatedBuildInputs => propagatedNativeBuildInputs
propagatedBuildInputs2 = propagatedBuildInputs;
@@ -87,7 +87,7 @@ mkDerivation {
-e 's@trap.*@@' \
-i "$s"
cat >> "$out/dev-envs/''${name/env-/}" << EOF
buildNativeInputs="$buildNativeInputs"
nativeBuildInputs="$nativeBuildInputs"
propagatedBuildInputs="$propagatedBuildInputs2"
# the setup-new script wants to write some data to a temp file.. so just let it do that and tidy up afterwards
tmp="\$("${pkgs.coreutils}/bin/mktemp" -d)"