From ab419e9f86c78f02c4ddc04f4586c20a25dcb53d Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@vicerveza.homeunix.net>
Date: Sat, 27 Nov 2010 15:49:43 +0000
Subject: Adding support for job control in bash cross-building, because
 otherwise it does not get built.

svn path=/nixpkgs/branches/stdenv-updates/; revision=24890
---
 pkgs/shells/bash/default.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'pkgs/shells/bash/default.nix')

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.
-- 
cgit 1.4.1