From eefd0d1745b711db1bf87f850dc863ab994a0c59 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 28 Aug 2005 00:30:53 +0000
Subject: [PATCH] This is what happens when you do a normal "cp -a" instead of
 a "svn cp". Argh. Can somebody please bring out the LART?

svn path=/nixpkgs/trunk/; revision=3733
---
 pkgs/os-specific/linux/e2fsprogs-diet/builder.sh  | 12 ++++++++++++
 pkgs/os-specific/linux/e2fsprogs-diet/default.nix | 13 +++++++++++++
 pkgs/os-specific/linux/e2fsprogs/builder.sh       |  2 --
 pkgs/os-specific/linux/e2fsprogs/default.nix      |  5 ++---
 4 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/os-specific/linux/e2fsprogs-diet/builder.sh
 create mode 100644 pkgs/os-specific/linux/e2fsprogs-diet/default.nix

diff --git a/pkgs/os-specific/linux/e2fsprogs-diet/builder.sh b/pkgs/os-specific/linux/e2fsprogs-diet/builder.sh
new file mode 100644
index 000000000000..bfd442c84e42
--- /dev/null
+++ b/pkgs/os-specific/linux/e2fsprogs-diet/builder.sh
@@ -0,0 +1,12 @@
+. $stdenv/setup
+
+export NIX_GLIBC_FLAGS_SET=1
+
+installPhase() {
+   make install
+   cd lib/uuid; make install
+}
+
+installPhase=installPhase
+
+genericBuild
diff --git a/pkgs/os-specific/linux/e2fsprogs-diet/default.nix b/pkgs/os-specific/linux/e2fsprogs-diet/default.nix
new file mode 100644
index 000000000000..c1ed8d0fe39a
--- /dev/null
+++ b/pkgs/os-specific/linux/e2fsprogs-diet/default.nix
@@ -0,0 +1,13 @@
+{stdenv, fetchurl, gettext, dietgcc}:
+
+stdenv.mkDerivation {
+  name = "e2fsprogs-1.36";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/e2fsprogs-1.36.tar.gz;
+    md5 = "1804ee96b76e5e7113fe3cecd6fe582b";
+  };
+  #configureFlags = "--with-diet-libc";
+  buildInputs = [gettext];
+  NIX_GCC = dietgcc;
+}
diff --git a/pkgs/os-specific/linux/e2fsprogs/builder.sh b/pkgs/os-specific/linux/e2fsprogs/builder.sh
index bfd442c84e42..050ca2d2a980 100644
--- a/pkgs/os-specific/linux/e2fsprogs/builder.sh
+++ b/pkgs/os-specific/linux/e2fsprogs/builder.sh
@@ -1,7 +1,5 @@
 . $stdenv/setup
 
-export NIX_GLIBC_FLAGS_SET=1
-
 installPhase() {
    make install
    cd lib/uuid; make install
diff --git a/pkgs/os-specific/linux/e2fsprogs/default.nix b/pkgs/os-specific/linux/e2fsprogs/default.nix
index c1ed8d0fe39a..3157a3ea2f87 100644
--- a/pkgs/os-specific/linux/e2fsprogs/default.nix
+++ b/pkgs/os-specific/linux/e2fsprogs/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, gettext, dietgcc}:
+{stdenv, fetchurl, gettext}:
 
 stdenv.mkDerivation {
   name = "e2fsprogs-1.36";
@@ -7,7 +7,6 @@ stdenv.mkDerivation {
     url = http://nix.cs.uu.nl/dist/tarballs/e2fsprogs-1.36.tar.gz;
     md5 = "1804ee96b76e5e7113fe3cecd6fe582b";
   };
-  #configureFlags = "--with-diet-libc";
+  configureFlags = "--enable-dynamic-e2fsck --enable-elf-shlibs";
   buildInputs = [gettext];
-  NIX_GCC = dietgcc;
 }