Author: viric
Date: Thu Nov 25 09:14:56 2010
New Revision: 24851
URL: https://svn.nixos.org/websvn/nix/?rev=24851&sc=1
Log:
Making bash and kbd cross-build
Modified:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kbd/default.nix
nixpkgs/branches/stdenv-updates/pkgs/shells/bash/default.nix
Modified: nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kbd/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kbd/default.nix
Thu Nov 25 09:05:04 2010 (r24850)
+++ nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kbd/default.nix
Thu Nov 25 09:14:56 2010 (r24851)
@@ -8,7 +8,7 @@
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
Modified: nixpkgs/branches/stdenv-updates/pkgs/shells/bash/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/shells/bash/default.nix Thu Nov
25 09:05:04 2010 (r24850)
+++ nixpkgs/branches/stdenv-updates/pkgs/shells/bash/default.nix Thu Nov
25 09:14:56 2010 (r24851)
@@ -34,8 +34,8 @@
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";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
