Author: viric
Date: Sat Nov 27 15:49:43 2010
New Revision: 24890
URL: https://svn.nixos.org/websvn/nix/?rev=24890&sc=1
Log:
Adding support for job control in bash cross-building, because otherwise it
does not get built.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/shells/bash/default.nix
Modified: nixpkgs/branches/stdenv-updates/pkgs/shells/bash/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/shells/bash/default.nix Sat Nov
27 12:59:55 2010 (r24889)
+++ nixpkgs/branches/stdenv-updates/pkgs/shells/bash/default.nix Sat Nov
27 15:49:43 2010 (r24890)
@@ -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 @@
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.
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
