From 6f1e09951cdb528e92d1766818a8c02c27eb26b5 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Mon, 31 Jul 2006 15:12:08 +0000
Subject: [PATCH] refactor

svn path=/nixpkgs/trunk/; revision=6006
---
 pkgs/os-specific/linux/e2fsprogs-diet/builder.sh  | 2 --
 pkgs/os-specific/linux/e2fsprogs-diet/default.nix | 3 +--
 pkgs/top-level/all-packages.nix                   | 3 ++-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/e2fsprogs-diet/builder.sh b/pkgs/os-specific/linux/e2fsprogs-diet/builder.sh
index 7715ac23ff9..07a6d756dd0 100644
--- a/pkgs/os-specific/linux/e2fsprogs-diet/builder.sh
+++ b/pkgs/os-specific/linux/e2fsprogs-diet/builder.sh
@@ -1,7 +1,5 @@
 source $stdenv/setup
 
-export NIX_GLIBC_FLAGS_SET=1
-
 installPhase() {
    make install
    cd lib/uuid; make install
diff --git a/pkgs/os-specific/linux/e2fsprogs-diet/default.nix b/pkgs/os-specific/linux/e2fsprogs-diet/default.nix
index 12e732b760d..d6ff41114a8 100644
--- a/pkgs/os-specific/linux/e2fsprogs-diet/default.nix
+++ b/pkgs/os-specific/linux/e2fsprogs-diet/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, gettext, dietgcc}:
+{stdenv, fetchurl, gettext}:
 
 stdenv.mkDerivation {
   name = "e2fsprogs-1.36";
@@ -8,5 +8,4 @@ stdenv.mkDerivation {
     md5 = "1804ee96b76e5e7113fe3cecd6fe582b";
   };
   buildInputs = [gettext];
-  NIX_GCC = dietgcc;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30e7878afd0..2788f47fd91 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1930,7 +1930,8 @@ rec {
   };
 
   e2fsprogsDiet = (import ../os-specific/linux/e2fsprogs-diet) {
-    inherit fetchurl stdenv gettext dietgcc;
+    inherit fetchurl gettext;
+    stdenv = overrideGCC stdenv dietgcc;
   };
 
   nettools = (import ../os-specific/linux/net-tools) {