From 5b2f05bcb8bc42fc9ec91d879ba8134dfbf2d5fd Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 30 Jul 2006 20:07:17 +0000
Subject: [PATCH] clean up the vim-diet Nix expression

svn path=/nixpkgs/trunk/; revision=5997
---
 pkgs/applications/editors/vim-diet/default.nix | 4 +---
 pkgs/top-level/all-packages.nix                | 3 ++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/vim-diet/default.nix b/pkgs/applications/editors/vim-diet/default.nix
index 096563614f0..76c022896fe 100644
--- a/pkgs/applications/editors/vim-diet/default.nix
+++ b/pkgs/applications/editors/vim-diet/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ncurses, dietgcc}:
+{stdenv, fetchurl, ncurses}:
  
 stdenv.mkDerivation {
   name = "vim-7.0";
@@ -11,7 +11,5 @@ stdenv.mkDerivation {
   inherit ncurses;
   buildInputs = [ncurses];
 
-  NIX_GCC = dietgcc;
-  NIX_GLIBC_FLAGS_SET=1;
   NIX_CFLAGS_COMPILE="-D_BSD_SOURCE=1";
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index af16839a612..ac650ef317e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2432,8 +2432,9 @@ rec {
   };
 
   vimDiet = (import ../applications/editors/vim-diet) {
-    inherit fetchurl stdenv dietgcc;
+    inherit fetchurl;
     ncurses = ncursesDiet;
+    stdenv = overrideGCC stdenv dietgcc;
   };
 
   nedit = import ../applications/editors/nedit {