forked from mirrors/nixpkgs
Making bash and kbd cross-build
svn path=/nixpkgs/branches/stdenv-updates/; revision=24851
This commit is contained in:
parent
5007314654
commit
d910fcbcee
|
@ -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
|
||||
|
|
|
@ -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";
|
||||
|
|
Loading…
Reference in a new issue