diff --git a/pkgs/applications/editors/nano/builder.sh b/pkgs/applications/editors/nano/builder.sh
deleted file mode 100644
index 4e2b8c15b247..000000000000
--- a/pkgs/applications/editors/nano/builder.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-. $stdenv/setup
-
-export CFLAGS="$CFLAGS -I$ncurses/include/ncurses"
-genericBuild
diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index dca0608b5cda..5f9e6273ff0d 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -2,12 +2,9 @@
 
 stdenv.mkDerivation {
   name = "nano-1.2.4";
-  builder = ./builder.sh;
   src = fetchurl {
     url = http://nix.cs.uu.nl/dist/tarballs/nano-1.2.4.tar.gz;
     md5 = "2c513310ec5e8b63abaecaf48670ac7a";
   };
-
-  inherit ncurses;
   buildInputs = [ncurses];
 }
diff --git a/pkgs/applications/networking/browsers/lynx/builder.sh b/pkgs/applications/networking/browsers/lynx/builder.sh
deleted file mode 100644
index d24d19b16143..000000000000
--- a/pkgs/applications/networking/browsers/lynx/builder.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-. $stdenv/setup
-
-export CFLAGS="-I$ncurses/include/ncurses"
-
-genericBuild
diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix
index d3af07682e3e..7e0d66fcf825 100644
--- a/pkgs/applications/networking/browsers/lynx/default.nix
+++ b/pkgs/applications/networking/browsers/lynx/default.nix
@@ -6,12 +6,10 @@ assert sslSupport -> openssl != null;
 
 stdenv.mkDerivation {
   name = "lynx-2.8.5";
-  builder = ./builder.sh;
   src = fetchurl {
     url = http://nix.cs.uu.nl/dist/tarballs/lynx2.8.5.tar.bz2;
     md5 = "d1e5134e5d175f913c16cb6768bc30eb";
   };
-  inherit ncurses;
   configureFlags = (if sslSupport then "--with-ssl" else "");
   buildInputs = [ncurses (if sslSupport then openssl else null)];
 }
diff --git a/pkgs/development/libraries/aalib/builder.sh b/pkgs/development/libraries/aalib/builder.sh
index f74b1d56228a..5d4df565a6da 100644
--- a/pkgs/development/libraries/aalib/builder.sh
+++ b/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
diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/development/libraries/aalib/default.nix
index f4717f66192b..5f138ef729af 100644
--- a/pkgs/development/libraries/aalib/default.nix
+++ b/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;
 }
diff --git a/pkgs/development/libraries/libcaca/builder.sh b/pkgs/development/libraries/libcaca/builder.sh
deleted file mode 100644
index 4c6535a43218..000000000000
--- a/pkgs/development/libraries/libcaca/builder.sh
+++ /dev/null
@@ -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
diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix
index 4c6e80940ad7..118a02a94e66 100644
--- a/pkgs/development/libraries/libcaca/default.nix
+++ b/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];
 }
diff --git a/pkgs/development/libraries/ncurses/builder.sh b/pkgs/development/libraries/ncurses/builder.sh
new file mode 100644
index 000000000000..ef8ed7d6f073
--- /dev/null
+++ b/pkgs/development/libraries/ncurses/builder.sh
@@ -0,0 +1,5 @@
+source $stdenv/setup
+
+configureFlags="--with-shared --includedir=$out/include"
+
+genericBuild
\ No newline at end of file
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 28a4a35c4a27..d0ca26f404b1 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/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";
 }
diff --git a/pkgs/development/tools/misc/texinfo/builder.sh b/pkgs/development/tools/misc/texinfo/builder.sh
deleted file mode 100644
index 0a24647bf81c..000000000000
--- a/pkgs/development/tools/misc/texinfo/builder.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-buildinputs="$ncurses"
-. $stdenv/setup
-
-tar xvfz $src
-cd texinfo-*
-./configure --prefix=$out
-make
-make install
diff --git a/pkgs/development/tools/misc/texinfo/default.nix b/pkgs/development/tools/misc/texinfo/default.nix
index 8f69b793b9a7..e10bc71a553c 100644
--- a/pkgs/development/tools/misc/texinfo/default.nix
+++ b/pkgs/development/tools/misc/texinfo/default.nix
@@ -1,13 +1,10 @@
 {stdenv, fetchurl, ncurses}:
 
-assert ncurses != null;
-
 stdenv.mkDerivation {
-  name = "texinfo-4.6";
-  builder = ./builder.sh;
+  name = "texinfo-4.8";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/texinfo-4.6.tar.gz;
-    md5 = "5730c8c0c7484494cca7a7e2d7459c64";
+    url = http://ftp.gnu.org/gnu/texinfo/texinfo-4.8.tar.bz2;
+    md5 = "6ba369bbfe4afaa56122e65b3ee3a68c";
   };
-  inherit ncurses;
+  buildInputs = [ncurses];
 }
diff --git a/pkgs/os-specific/linux/alsa/utils/builder.sh b/pkgs/os-specific/linux/alsa/utils/builder.sh
deleted file mode 100644
index 18e576046819..000000000000
--- a/pkgs/os-specific/linux/alsa/utils/builder.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-source $stdenv/setup
-
-export NIX_CFLAGS_COMPILE="-I$ncurses/include/ncurses -I$ncurses/include $NIX_CFLAGS_COMPILE"
-
-genericBuild
diff --git a/pkgs/os-specific/linux/alsa/utils/default.nix b/pkgs/os-specific/linux/alsa/utils/default.nix
index 69df23d3ea98..09ee5b954252 100644
--- a/pkgs/os-specific/linux/alsa/utils/default.nix
+++ b/pkgs/os-specific/linux/alsa/utils/default.nix
@@ -2,11 +2,9 @@
 
 stdenv.mkDerivation {
   name = "alsa-utils-1.0.9a";
-  builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.alsa-project.org/pub/utils/alsa-utils-1.0.9a.tar.bz2;
     md5 = "d4b77e9fe0311772293e402fdd634ad2";
   };
   buildInputs = [alsaLib ncurses gettext];
-  inherit ncurses;
 }
diff --git a/pkgs/os-specific/linux/procps/builder.sh b/pkgs/os-specific/linux/procps/builder.sh
index aef3df8f5be3..9351c6c557db 100644
--- a/pkgs/os-specific/linux/procps/builder.sh
+++ b/pkgs/os-specific/linux/procps/builder.sh
@@ -1,7 +1,5 @@
 . $stdenv/setup
 
-export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$ncurses/include/ncurses"
-
 export DESTDIR=$out
 
 genericBuild
diff --git a/pkgs/os-specific/linux/procps/default.nix b/pkgs/os-specific/linux/procps/default.nix
index a211bdde4545..a5be0ca1a2f6 100644
--- a/pkgs/os-specific/linux/procps/default.nix
+++ b/pkgs/os-specific/linux/procps/default.nix
@@ -1,13 +1,12 @@
 {stdenv, fetchurl, ncurses}:
 
 stdenv.mkDerivation {
-  name = "procps-3.2.4";
+  name = "procps-3.2.5";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/procps-3.2.4.tar.gz;
-    md5 = "1bec6740b385b3f73800827437f14f85";
+    url = http://procps.sourceforge.net/procps-3.2.5.tar.gz;
+    md5 = "cde0e3612d1d7c68f404d46f01c44fb4";
   };
   patches = [./makefile.patch];
   buildInputs = [ncurses];
-  inherit ncurses;
 }