clean up the vim-diet Nix expression

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

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";
 }

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 {