diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-20 22:56:58 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-20 22:56:58 +0000 |
| commit | a5fee3325a61b9ae33a0132a653d19079710002e (patch) | |
| tree | fa8f99e4a6bc671a5fc0f2a9153d385d59b342be /pkgs/shells/bash | |
| parent | b27cf66ee28bc9fdec9a36fb00e019d5c0b57402 (diff) | |
| download | nixlib-a5fee3325a61b9ae33a0132a653d19079710002e.tar nixlib-a5fee3325a61b9ae33a0132a653d19079710002e.tar.gz nixlib-a5fee3325a61b9ae33a0132a653d19079710002e.tar.bz2 nixlib-a5fee3325a61b9ae33a0132a653d19079710002e.tar.lz nixlib-a5fee3325a61b9ae33a0132a653d19079710002e.tar.xz nixlib-a5fee3325a61b9ae33a0132a653d19079710002e.tar.zst nixlib-a5fee3325a61b9ae33a0132a653d19079710002e.zip | |
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
Diffstat (limited to 'pkgs/shells/bash')
| -rw-r--r-- | pkgs/shells/bash/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
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"; |