Fixing the uboot cross-build.

svn path=/nixpkgs/branches/stdenv-updates/; revision=18473

pkgs/build-support/gcc-cross-wrapper/builder.sh

@@ -40,7 +40,7 @@ doSubstitute() {
         --subst-var "cflagsLink" \
         --subst-var "ldflags" \
         --subst-var "ldflagsBefore" \
-        --subst-var-by "ld" "$ldPath/ld"
+        --subst-var-by "ld" "$ldPath/$crossConfig-ld"
 }
 
 

pkgs/misc/uboot/default.nix

@@ -35,14 +35,14 @@ stdenv.mkDerivation {
 
   buildPhase = ''
     unset src
-    if test -z "$crossTarget"; then
+    if test -z "$crossConfig"; then
         make clean all
     else
         make clean all ARCH=arm CROSS_COMPILE=$crossConfig-
     fi
   '';
 
-  buildInputs = [ unzip ];
+  buildNativeInputs = [ unzip ];
 
   dontStrip = true;
   NIX_STRIP_DEBUG = false;