From 14a20b717957192c79d1cc66fc0a10f595d7ebf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 2 Sep 2010 19:18:04 +0000
Subject: [PATCH] Fixing the evaluation of cross built uclibc in the case of
 lacking extraConfig

svn path=/nixpkgs/branches/stdenv-updates/; revision=23602
---
 pkgs/os-specific/linux/uclibc/default.nix |  2 +-
 pkgs/top-level/release-cross.nix          | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix
index 073927ba49a..ce95dbaba92 100644
--- a/pkgs/os-specific/linux/uclibc/default.nix
+++ b/pkgs/os-specific/linux/uclibc/default.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation {
     cat << EOF | parseconfig
     ${nixConfig}
     ${extraConfig}
-    ${if cross != null then cross.uclibc.extraConfig else ""}
+    ${if cross != null then stdenv.lib.attrByPath [ "uclibc" "extraConfig" ] "" cross else ""}
     $extraCrossConfig
     EOF
     make oldconfig
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index 7b75a447083..9d961d0c09e 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -4,9 +4,10 @@ let
 
   /* Basic list of packages to cross-build */
   basicHostDrv = {
+    gccCrossStageFinal = nativePlatforms;
     bison.hostDrv = nativePlatforms;
     busybox.hostDrv = nativePlatforms;
-    coreutils_real.hostDrv = nativePlatforms;
+    coreutils.hostDrv = nativePlatforms;
     dropbear.hostDrv = nativePlatforms;
     tightvnc.hostDrv = nativePlatforms;
     #openoffice.hostDrv = nativePlatforms;
@@ -18,6 +19,8 @@ let
     nixUnstable.hostDrv = nativePlatforms;
     linuxPackages_2_6_32.kernel.hostDrv = linux;
     linuxPackages_2_6_33.kernel.hostDrv = linux;
+    linuxPackages_2_6_34.kernel.hostDrv = linux;
+    linuxPackages_2_6_35.kernel.hostDrv = linux;
   };
 
   /* Basic list of packages to be natively built,
@@ -63,6 +66,13 @@ let
     platform = pkgs.platforms.sheevaplug;
     libc = "uclibc";
     openssl.system = "linux-generic32";
+    uclibc.extraConfig = ''
+      CONFIG_ARM_OABI n
+      CONFIG_ARM_EABI y
+      ARCH_BIG_ENDIAN n
+      ARCH_WANTS_BIG_ENDIAN n
+      ARCH_WANTS_LITTLE_ENDIAN y
+    '';
   };
 
 in {
@@ -135,7 +145,6 @@ let
 in {
   crossMingw32 = mapTestOnCross crossSystem {
     windows.wxMSW.hostDrv = nativePlatforms;
-    gccCrossStageFinal = nativePlatforms;
   };
 }) // (
 
@@ -153,7 +162,6 @@ let
   };
 in {
   crossGNU = mapTestOnCross crossSystem {
-    gccCrossStageFinal = nativePlatforms;
     hurdCross = nativePlatforms;
     mach.hostDrv = nativePlatforms;
 
@@ -194,7 +202,6 @@ let
   };
 in {
   fuloongminipc = mapTestOnCross crossSystem {
-    gccCrossStageFinal = nativePlatforms;
 
     coreutils_real.hostDrv = nativePlatforms;
     ed.hostDrv = nativePlatforms;
@@ -255,7 +262,6 @@ let
   };
 in {
   nanonote = mapTestOnCross crossSystem {
-    gccCrossStageFinal = nativePlatforms;
 
     coreutils_real.hostDrv = nativePlatforms;
     ed.hostDrv = nativePlatforms;