From a5fee3325a61b9ae33a0132a653d19079710002e Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Fri, 20 Nov 2009 22:56:58 +0000 Subject: Fixing some things on the gcc-cross-wrapper (libc was not properly added to the linking path), and with this achieved bash being cross-compilable. I fixed the few expressions involved in bash building, so they have well stated native and non-native inputs. I also tried to cross-build guile, and with this I found a problem in the actual cross-gcc: it calls the binutils ld, instead of the ld wrapper. This way, the programs/shared_libraries don't get the proper -rpath. svn path=/nixpkgs/branches/stdenv-updates/; revision=18497 --- pkgs/shells/bash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/shells/bash/default.nix') diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index 02736dec2855..59b3ef73275a 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { import ./bash-patches.nix patch; # Note: Bison is needed because the patches above modify parse.y. - buildInputs = [bison] - ++ stdenv.lib.optional (texinfo != null) texinfo + buildNativeInputs = [bison]; + buildInputs = stdenv.lib.optional (texinfo != null) texinfo ++ stdenv.lib.optional interactive readline; configureFlags = "--with-installed-readline"; -- cgit 1.4.1