public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding support for job control in bash cross-building, because otherwise it does not get built.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24890
This commit is contained in:
Lluís Batlle i Rossell 2010-11-27 15:49:43 +00:00
parent c1dc539303
commit ab419e9f86
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/shells/bash/default.nix
View File

@ -2,7 +2,10 @@
assert interactive -> readline != null; 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 { stdenv.mkDerivation rec {
name = "${realName}-p${toString (builtins.length patches)}"; name = "${realName}-p${toString (builtins.length patches)}";
@ -33,12 +36,17 @@ stdenv.mkDerivation rec {
in in
import ./bash-patches.nix patch; 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. # Note: Bison is needed because the patches above modify parse.y.
buildNativeInputs = [bison] buildNativeInputs = [bison]
++ stdenv.lib.optional (texinfo != null) texinfo ++ stdenv.lib.optional (texinfo != null) texinfo
++ stdenv.lib.optional interactive readline; ++ stdenv.lib.optional interactive readline;
configureFlags = if interactive then "--with-installed-readline" else "--disable-readline";
postInstall = '' postInstall = ''
# Add an `sh' -> `bash' symlink. # Add an `sh' -> `bash' symlink.