JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Making bash and kbd cross-build

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24851
This commit is contained in:
Lluís Batlle i Rossell 2010-11-25 09:14:56 +00:00
parent 5007314654
commit d910fcbcee
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/kbd/default.nix
View File

@ -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

4
pkgs/shells/bash/default.nix
View File

@ -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";