diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-11-25 09:14:56 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-11-25 09:14:56 +0000 |
commit | d910fcbcee35023475e2f0756c90218d8d5cd866 (patch) | |
tree | 007f31b09f498bd3f1440df951533b2e5ccd8e68 /pkgs | |
parent | 5007314654d9c996b78411fe570991d857c56369 (diff) | |
download | nixlib-d910fcbcee35023475e2f0756c90218d8d5cd866.tar nixlib-d910fcbcee35023475e2f0756c90218d8d5cd866.tar.gz nixlib-d910fcbcee35023475e2f0756c90218d8d5cd866.tar.bz2 nixlib-d910fcbcee35023475e2f0756c90218d8d5cd866.tar.lz nixlib-d910fcbcee35023475e2f0756c90218d8d5cd866.tar.xz nixlib-d910fcbcee35023475e2f0756c90218d8d5cd866.tar.zst nixlib-d910fcbcee35023475e2f0756c90218d8d5cd866.zip |
Making bash and kbd cross-build
svn path=/nixpkgs/branches/stdenv-updates/; revision=24851
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/os-specific/linux/kbd/default.nix | 2 | ||||
-rw-r--r-- | 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 2483a86c4864..c54ac4c2c731 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 0f4b610f4123..7971a19871c3 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"; |