From d910fcbcee35023475e2f0756c90218d8d5cd866 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 25 Nov 2010 09:14:56 +0000 Subject: [PATCH] Making bash and kbd cross-build svn path=/nixpkgs/branches/stdenv-updates/; revision=24851 --- pkgs/os-specific/linux/kbd/default.nix | 2 +- pkgs/shells/bash/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index 2483a86c486..c54ac4c2c73 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0ff674y6d3b6ix08b9l2yzv8igns768biyp5y92vip7iz4xv2p2j"; }; - buildInputs = [ bison flex autoconf automake ]; + buildNativeInputs = [ bison flex autoconf automake ]; # We get a warning in armv5tel-linux and the fuloong2f, # so we disable -Werror in it diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index 0f4b610f412..7971a19871c 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { import ./bash-patches.nix patch; # Note: Bison is needed because the patches above modify parse.y. - buildNativeInputs = [bison]; - buildInputs = stdenv.lib.optional (texinfo != null) texinfo + buildNativeInputs = [bison] + ++ stdenv.lib.optional (texinfo != null) texinfo ++ stdenv.lib.optional interactive readline; configureFlags = if interactive then "--with-installed-readline" else "--disable-readline";