* Bash on dietlibc.

* Pass -D_BSD_SOURCE=1 by default in the dietlibc stdenv.

svn path=/nixpkgs/trunk/; revision=6768

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 {})
+
+)

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 */