Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc. "buildNativeInputs" sounds like an imperative rather than a noun phrase.
This commit is contained in:
@@ -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)"
|
||||
|
||||
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
|
||||
sha256 = "1rld7q3ww89si84g80hqskd1z995lni5r5xc4d4322n99wqiarh6";
|
||||
};
|
||||
|
||||
buildNativeInputs = [ unzip ];
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
|
||||
fi
|
||||
'';
|
||||
|
||||
buildNativeInputs = [ unzip ];
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
|
||||
fi
|
||||
'';
|
||||
|
||||
buildNativeInputs = [ unzip ];
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user