From 3b747e92e5e300df5635b2f6d788a9c13ec15bde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 27 Feb 2010 18:51:06 +0000
Subject: [PATCH] Fixing the correct handling of uboot in the initrd and the
 kernel derivations. (nixos on sheevaplug)

svn path=/nixpkgs/trunk/; revision=20275
---
 pkgs/build-support/kernel/make-initrd.nix | 2 +-
 pkgs/os-specific/linux/kernel/generic.nix | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix
index f2cf894b8630..2c0ca37553df 100644
--- a/pkgs/build-support/kernel/make-initrd.nix
+++ b/pkgs/build-support/kernel/make-initrd.nix
@@ -16,7 +16,7 @@
 
 let
   inputsFun = ubootName : [perl cpio]
-    ++ stdenv.lib.optional (ubootName != null) [ ubootChooser ubootName ];
+    ++ stdenv.lib.optional (ubootName != null) [ (ubootChooser ubootName) ];
   makeUInitrdFun = ubootName : (ubootName != null);
 in
 stdenv.mkDerivation {
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index ff6099e74570..f54af384816b 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -40,6 +40,7 @@
     kernelAutoModules = true;
     kernelTarget = "bzImage";
   }
+, ubootChooser ? null
 , ...
 }:
 
@@ -82,7 +83,7 @@ stdenv.mkDerivation {
   ignoreConfigErrors = (userModeLinux || platform.name != "pc");
 
   buildNativeInputs = [ perl mktemp ];
-  buildInputs = lib.optional (platform.uboot != null) platform.uboot;
+  buildInputs = lib.optional (platform.uboot != null) (ubootChooser platform.uboot);
 
   platformName = platform.name;
   kernelBaseConfig = platform.kernelBaseConfig;