* Replace bash with bash-interactive.

svn path=/nixpkgs/trunk/; revision=8761
This commit is contained in:
Eelco Dolstra
2007-05-24 15:44:03 +00:00
parent 5021babc20
commit d384ef5673
3 changed files with 1 additions and 1 deletions

View File

@@ -0,0 +1,28 @@
{stdenv, fetchurl, bison, interactive ? false, ncurses ? null}:
assert interactive -> ncurses != null;
stdenv.mkDerivation {
name = "bash-3.2-p17";
src = fetchurl {
url = http://losser.st-lab.cs.uu.nl/~eelco/dist/bash-3.2-p17.tar.bz2;
sha256 = "153gg2z2s3ar7vni3345nnmdisha4b8cxzsj79d8ap6m6i4c35f5";
};
postInstall = "ln -s bash $out/bin/sh";
patches = [
# For dietlibc builds.
./winsize.patch
];
# !!! only needed for bash-3.2 (because of bash32-001.patch)
buildInputs = [bison] ++ stdenv.lib.optional interactive ncurses;
meta = {
description =
"GNU Bourne-Again Shell, the de facto standard shell on Linux" +
(if interactive then " (for interactive use)" else "");
};
}

View File

@@ -0,0 +1,14 @@
diff -rc bash-3.1-orig/lib/sh/winsize.c bash-3.1/lib/sh/winsize.c
*** bash-3.1-orig/lib/sh/winsize.c 2006-10-18 18:08:25.000000000 +0200
--- bash-3.1/lib/sh/winsize.c 2006-10-18 18:10:00.000000000 +0200
***************
*** 30,35 ****
--- 30,37 ----
#include <sys/ioctl.h>
+ #include <termios.h>
+
#if !defined (STRUCT_WINSIZE_IN_SYS_IOCTL)
/* For struct winsize on SCO */
/* sys/ptem.h has winsize but needs mblk_t from sys/stream.h */