* Install ncurses header files in $out/include, not

$out/include/ncurses.  This simplifies many builders.

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

pkgs/development/libraries/aalib/builder.sh

@@ -1,6 +1,5 @@
 source $stdenv/setup
 
 configureFlags="--without-x --with-ncurses=$ncurses"
-export NIX_CFLAGS_COMPILE="-I$ncurses/include/ncurses $NIX_CFLAGS_COMPILE"
 
 genericBuild

pkgs/development/libraries/aalib/default.nix

@@ -7,5 +7,6 @@ stdenv.mkDerivation {
     url = http://surfnet.dl.sourceforge.net/sourceforge/aa-project/aalib-1.4rc4.tar.gz;
     md5 = "d5aa8e9eae07b7441298b5c30490f6a6";
   };
+  buildInputs = [ncurses];
   inherit ncurses;
 }

pkgs/development/libraries/libcaca/builder.sh

@@ -1,6 +0,0 @@
-source $stdenv/setup
-
-configureFlags="--disable-x11 --disable-imlib2 --disable-doc"
-export NIX_CFLAGS_COMPILE="-I$ncurses/include/ncurses -I$ncurses/include $NIX_CFLAGS_COMPILE"
-
-genericBuild

pkgs/development/libraries/libcaca/default.nix

@@ -2,11 +2,10 @@
 
 stdenv.mkDerivation {
   name = "libcaca-0.9";
-  builder = ./builder.sh;
   src = fetchurl {
     url = http://sam.zoy.org/libcaca/libcaca-0.9.tar.bz2;
     md5 = "c7d5c46206091a9203fcb214abb25e4a";
   };
-  inherit ncurses;
+  configureFlags = "--disable-x11 --disable-imlib2 --disable-doc";
   propagatedBuildInputs = [ncurses];
 }

pkgs/development/libraries/ncurses/builder.sh

@@ -0,0 +1,5 @@
+source $stdenv/setup
+
+configureFlags="--with-shared --includedir=$out/include"
+
+genericBuild

pkgs/development/libraries/ncurses/default.nix

@@ -2,9 +2,9 @@
 
 stdenv.mkDerivation {
   name = "ncurses-5.4";
+  builder = ./builder.sh;
   src = fetchurl {
     url = http://nix.cs.uu.nl/dist/tarballs/ncurses-5.4.tar.gz;
     md5 = "069c8880072060373290a4fefff43520";
   };
-  configureFlags = "--with-shared";
 }