summary refs log tree commit diff
path: root/pkgs/misc/my-env/default.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2012-12-28 19:20:09 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2012-12-28 19:20:09 +0100
commitab3eeabfeddacf3e159e68ee1541a6281a1e9d1b (patch)
tree8070852a5ee331104a06de5395d30223185f936a /pkgs/misc/my-env/default.nix
parent5be0a9acd7b9abe4bff3202a7ac7defc17a37877 (diff)
downloadnixlib-ab3eeabfeddacf3e159e68ee1541a6281a1e9d1b.tar
nixlib-ab3eeabfeddacf3e159e68ee1541a6281a1e9d1b.tar.gz
nixlib-ab3eeabfeddacf3e159e68ee1541a6281a1e9d1b.tar.bz2
nixlib-ab3eeabfeddacf3e159e68ee1541a6281a1e9d1b.tar.lz
nixlib-ab3eeabfeddacf3e159e68ee1541a6281a1e9d1b.tar.xz
nixlib-ab3eeabfeddacf3e159e68ee1541a6281a1e9d1b.tar.zst
nixlib-ab3eeabfeddacf3e159e68ee1541a6281a1e9d1b.zip
Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
Diffstat (limited to 'pkgs/misc/my-env/default.nix')
-rw-r--r--pkgs/misc/my-env/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix
index 19c105bf4f02..85499e893f8e 100644
--- a/pkgs/misc/my-env/default.nix
+++ b/pkgs/misc/my-env/default.nix
@@ -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)"