From 50f412047d82c23ca2e1e6d9a8c022b98e1f4755 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 24 Nov 2006 11:36:57 +0000
Subject: [PATCH] * Use symlinks instead of hard links in e2fsprogs. * Merge
 e2fsprogs and e2fsprogs-diet.

svn path=/nixpkgs/trunk/; revision=7116
---
 .../os-specific/linux/e2fsprogs-diet/builder.sh | 10 ----------
 .../linux/e2fsprogs-diet/default.nix            | 11 -----------
 pkgs/os-specific/linux/e2fsprogs/builder.sh     | 17 -----------------
 pkgs/os-specific/linux/e2fsprogs/default.nix    | 11 +++++++----
 pkgs/top-level/all-packages.nix                 |  2 +-
 5 files changed, 8 insertions(+), 43 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/e2fsprogs-diet/builder.sh
 delete mode 100644 pkgs/os-specific/linux/e2fsprogs-diet/default.nix
 delete mode 100644 pkgs/os-specific/linux/e2fsprogs/builder.sh

diff --git a/pkgs/os-specific/linux/e2fsprogs-diet/builder.sh b/pkgs/os-specific/linux/e2fsprogs-diet/builder.sh
deleted file mode 100644
index 07a6d756dd09..000000000000
--- a/pkgs/os-specific/linux/e2fsprogs-diet/builder.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-source $stdenv/setup
-
-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
deleted file mode 100644
index d6ff41114a8b..000000000000
--- a/pkgs/os-specific/linux/e2fsprogs-diet/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{stdenv, fetchurl, gettext}:
-
-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";
-  };
-  buildInputs = [gettext];
-}
diff --git a/pkgs/os-specific/linux/e2fsprogs/builder.sh b/pkgs/os-specific/linux/e2fsprogs/builder.sh
deleted file mode 100644
index fa4d2c98859d..000000000000
--- a/pkgs/os-specific/linux/e2fsprogs/builder.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-source $stdenv/setup
-
-installPhase() {
-   make install
-   # oh this is fugly and should actually be fixed in e2fsprogs
-   ensureDir $out/man/man3
-   make -C lib/blkid install
-   make -C lib/e2p install
-   make -C lib/et install
-   make -C lib/ext2fs install
-   make -C lib/ss install
-   make -C lib/uuid install
-}
-
-installPhase=installPhase
-
-genericBuild
diff --git a/pkgs/os-specific/linux/e2fsprogs/default.nix b/pkgs/os-specific/linux/e2fsprogs/default.nix
index 73bd40288b12..5ae1880d09c4 100644
--- a/pkgs/os-specific/linux/e2fsprogs/default.nix
+++ b/pkgs/os-specific/linux/e2fsprogs/default.nix
@@ -2,14 +2,17 @@
 
 stdenv.mkDerivation {
   name = "e2fsprogs-1.39";
-  builder = ./builder.sh;
   src = fetchurl {
     url = http://nix.cs.uu.nl/dist/tarballs/e2fsprogs-1.39.tar.gz;
     md5 = "06f7806782e357797fad1d34b7ced0c6";
   };
-  configureFlags = "--enable-dynamic-e2fsck --enable-elf-shlibs";
+  configureFlags =
+    if stdenv ? isDietLibC
+    then ""
+    else "--enable-dynamic-e2fsck --enable-elf-shlibs";
   buildInputs = [gettext];
   patches = [./e2fsprogs-1.39_etc.patch];
+  preInstall = "installFlagsArray=('LN=ln -s')";
+  NIX_CFLAGS_COMPILE =
+    if stdenv ? isDietLibC then "-UHAVE_SYS_PRCTL_H" else "";
 }
-
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 892441ec55ae..64b318948f98 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2047,7 +2047,7 @@ rec {
     inherit fetchurl stdenv gettext;
   };
 
-  e2fsprogsDiet = import ../os-specific/linux/e2fsprogs-diet {
+  e2fsprogsDiet = import ../os-specific/linux/e2fsprogs {
     inherit fetchurl gettext;
     stdenv = useDietLibC stdenv;
   };