From 255a4a91f09838c3ffa45dd31a5ab372095efedd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 2 Jul 2009 08:58:58 +0000
Subject: [PATCH] * Get rid of some dietlibc stuff.

svn path=/nixpkgs/trunk/; revision=16132
---
 .../applications/editors/vim-diet/default.nix | 19 -------------------
 .../libraries/ncurses-diet/builder.sh         |  5 -----
 .../libraries/ncurses-diet/default.nix        | 10 ----------
 pkgs/top-level/all-packages.nix               | 17 -----------------
 4 files changed, 51 deletions(-)
 delete mode 100644 pkgs/applications/editors/vim-diet/default.nix
 delete mode 100644 pkgs/development/libraries/ncurses-diet/builder.sh
 delete mode 100644 pkgs/development/libraries/ncurses-diet/default.nix

diff --git a/pkgs/applications/editors/vim-diet/default.nix b/pkgs/applications/editors/vim-diet/default.nix
deleted file mode 100644
index 7e56d902282..00000000000
--- a/pkgs/applications/editors/vim-diet/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{stdenv, fetchurl, ncurses}:
- 
-stdenv.mkDerivation {
-  name = "vim-7.0";
- 
-  src = fetchurl {
-    url = ftp://ftp.vim.org/pub/vim/unix/vim-7.0.tar.bz2;
-    md5 = "4ca69757678272f718b1041c810d82d8";
-  };
- 
-  inherit ncurses;
-  buildInputs = [ncurses];
-
-  NIX_CFLAGS_COMPILE="-D_BSD_SOURCE=1";
-
-  meta = {
-    homepage = http://www.vim.org;
-  };
-}
diff --git a/pkgs/development/libraries/ncurses-diet/builder.sh b/pkgs/development/libraries/ncurses-diet/builder.sh
deleted file mode 100644
index 999f3a84e56..00000000000
--- a/pkgs/development/libraries/ncurses-diet/builder.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-source $stdenv/setup
-
-configureFlags="--includedir=$out/include --without-cxx-binding"
-
-genericBuild
diff --git a/pkgs/development/libraries/ncurses-diet/default.nix b/pkgs/development/libraries/ncurses-diet/default.nix
deleted file mode 100644
index 2d780369351..00000000000
--- a/pkgs/development/libraries/ncurses-diet/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "ncurses-5.5";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = mirror://gnu/ncurses/ncurses-5.5.tar.gz;
-    md5 = "e73c1ac10b4bfc46db43b2ddfd6244ef";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fc64ecbdc1e..10d4304c651 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3838,11 +3838,6 @@ let
     unicode = (system != "i686-cygwin");
   };
 
-  ncursesDiet = import ../development/libraries/ncurses-diet {
-    inherit fetchurl;
-    stdenv = useDietLibC stdenv;
-  };
-
   neon = neon026;
 
   neon026 = import ../development/libraries/neon/0.26.nix {
@@ -6739,12 +6734,6 @@ let
     inherit fetchurl stdenv ncurses gettext;
   };
 
-  nanoDiet = lowPrio (appendToName "diet" (import ../applications/editors/nano {
-    inherit fetchurl gettext;
-    ncurses = ncursesDiet;
-    stdenv = useDietLibC stdenv;
-  }));
-
   nedit = import ../applications/editors/nedit {
     inherit fetchurl stdenv x11;
     inherit (xlibs) libXpm;
@@ -7128,12 +7117,6 @@ let
     inherit fetchurl stdenv ncurses lib;
   };
 
-  vimDiet = lowPrio (appendToName "diet" (import ../applications/editors/vim-diet {
-    inherit fetchurl;
-    ncurses = ncursesDiet;
-    stdenv = useDietLibC stdenv;
-  }));
-
   vimHugeX = import ../applications/editors/vim {
     inherit fetchurl stdenv lib ncurses pkgconfig
       perl python tcl;