diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-11-27 15:49:43 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-11-27 15:49:43 +0000 |
| commit | ab419e9f86c78f02c4ddc04f4586c20a25dcb53d (patch) | |
| tree | 9aa68d589cab034f38c186b4b541b58d5fc8f6e0 /pkgs/shells | |
| parent | c1dc539303dd89040d9fcfaf2b1b6b19cf53a443 (diff) | |
Adding support for job control in bash cross-building, because otherwise it does not get built.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24890
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/bash/default.nix | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index 7971a19871c38..60eaf4d4dab3a 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -2,7 +2,10 @@ assert interactive -> readline != null; -let realName = "bash-4.1"; in +let + realName = "bash-4.1"; + baseConfigureFlags = if interactive then "--with-installed-readline" else "--disable-readline"; +in stdenv.mkDerivation rec { name = "${realName}-p${toString (builtins.length patches)}"; @@ -33,12 +36,17 @@ stdenv.mkDerivation rec { in import ./bash-patches.nix patch; + crossAttrs = { + configureFlags = baseConfigureFlags + + " bash_cv_job_control_missing=nomissing bash_cv_sys_named_pipes=nomissing"; + }; + + configureFlags = baseConfigureFlags; + # Note: Bison is needed because the patches above modify parse.y. buildNativeInputs = [bison] ++ stdenv.lib.optional (texinfo != null) texinfo ++ stdenv.lib.optional interactive readline; - - configureFlags = if interactive then "--with-installed-readline" else "--disable-readline"; postInstall = '' # Add an `sh' -> `bash' symlink. |