diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-10-18 16:16:07 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-10-18 16:16:07 +0000 |
| commit | ce22859f8aa3b06dc8277376916c619a34030310 (patch) | |
| tree | 70db57959bf759bede29a0e22e1341fd573f2dab /pkgs/shells/bash | |
| parent | f3619824a9fe8bc6650ded1827846b76865c86a8 (diff) | |
| download | nixlib-ce22859f8aa3b06dc8277376916c619a34030310.tar nixlib-ce22859f8aa3b06dc8277376916c619a34030310.tar.gz nixlib-ce22859f8aa3b06dc8277376916c619a34030310.tar.bz2 nixlib-ce22859f8aa3b06dc8277376916c619a34030310.tar.lz nixlib-ce22859f8aa3b06dc8277376916c619a34030310.tar.xz nixlib-ce22859f8aa3b06dc8277376916c619a34030310.tar.zst nixlib-ce22859f8aa3b06dc8277376916c619a34030310.zip | |
* Bash on dietlibc.
* Pass -D_BSD_SOURCE=1 by default in the dietlibc stdenv. svn path=/nixpkgs/trunk/; revision=6768
Diffstat (limited to 'pkgs/shells/bash')
| -rw-r--r-- | pkgs/shells/bash/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/shells/bash/winsize.patch | 14 |
2 files changed, 23 insertions, 1 deletions
diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index 82f204bd52c4..a8dd2e3dd63e 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { +stdenv.mkDerivation ({ name = "bash-3.1"; builder = ./builder.sh; src = fetchurl { @@ -12,3 +12,11 @@ stdenv.mkDerivation { description = "GNU Bourne-Again Shell, the de facto standard shell on Linux"; }; } + +# libcompat.a is needed on dietlibc for stpcpy(). +// (if stdenv ? isDietLibC then { + NIX_LDFLAGS = "-lcompat"; + patches = [./winsize.patch]; +} else {}) + +) diff --git a/pkgs/shells/bash/winsize.patch b/pkgs/shells/bash/winsize.patch new file mode 100644 index 000000000000..bbe4151e0cc7 --- /dev/null +++ b/pkgs/shells/bash/winsize.patch @@ -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 */ |