From fedf79faeae90192ea83d9dfb15f252a23ece27e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 22 Jan 2010 15:00:15 +0000
Subject: Fixing 'my-env' on stdenv-updates, considering that users will add
 'buildInputs' to its mkDerivation parameter, while the stdenv setup.sh script
 would expect buildNativeInputs.

svn path=/nixpkgs/branches/stdenv-updates/; revision=19615
---
 pkgs/misc/my-env/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'pkgs/misc/my-env')

diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix
index 34a21a7e37b7..7c6c2d462393 100644
--- a/pkgs/misc/my-env/default.nix
+++ b/pkgs/misc/my-env/default.nix
@@ -41,7 +41,9 @@
 
 { mkDerivation, substituteAll, pkgs } : { stdenv ? pkgs.stdenv, name, buildInputs ? [], cTags ? [], extraCmds ? ""} :
 mkDerivation {
-  buildInputs = [ ] ++ buildInputs ;
+  # The setup.sh script from stdenv will expect the native build inputs in
+  # the buildNativeInputs environment variable.
+  buildNativeInputs = [ ] ++ buildInputs ;
   name = "env-${name}";
   phases = "buildPhase";
   setupNew = substituteAll {
@@ -62,7 +64,7 @@ mkDerivation {
         -e 's@trap.*@@' \
         -i "$s"
     cat >> "$out/dev-envs/''${name/env-/}" << EOF
-      buildInputs="$buildNativeInputs"
+      buildNativeInputs="$buildNativeInputs"
       # 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)"
       NIX_BUILD_TOP="\$tmp"
-- 
cgit v1.2.3