From 11c20b3a2cd9a3ba04f1c4aa8e4e967e3ced0cf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 6 Mar 2010 22:04:21 +0000 Subject: [PATCH] Making the cross kernel builds take properly the cross-built uboot, when needed. svn path=/nixpkgs/trunk/; revision=20455 --- pkgs/os-specific/linux/kernel/generic.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 5979b038283..15811713324 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -114,7 +114,10 @@ stdenv.mkDerivation { kernelConfig = kernelConfigFun configCross; - buildInputs = lib.optional (cp.uboot != null) (ubootChooser cp.uboot); + # The substitution of crossAttrs happens *after* the stdenv cross adapter sets + # the parameters for the usual stdenv. Thus, we need to specify + # the ".hostDrv" in the buildInputs here. + buildInputs = lib.optional (cp.uboot != null) (ubootChooser cp.uboot).hostDrv; }; meta = {