From ed11a2bbc8a21e2fc70eb2367b1ea6455c70f911 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 6 Jan 2009 23:22:29 +0000
Subject: [PATCH] Build e2fsprogs at last

svn path=/nixpkgs/trunk/; revision=13719
---
 pkgs/os-specific/linux/e2fsprogs/default.nix | 7 ++++++-
 pkgs/top-level/all-packages.nix              | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/e2fsprogs/default.nix b/pkgs/os-specific/linux/e2fsprogs/default.nix
index ce0c55bcb40..c116b74a810 100644
--- a/pkgs/os-specific/linux/e2fsprogs/default.nix
+++ b/pkgs/os-specific/linux/e2fsprogs/default.nix
@@ -10,8 +10,12 @@ stdenv.mkDerivation {
   
   configureFlags =
     if stdenv ? isDietLibC
-    then ""
+    then "--with-diet-libc"
     else "--enable-elf-shlibs";
+
+  preBuild = if stdenv ? isDietLibC then ''
+    sed -e 's/-lpthread//' -i Makefile */Makefile */*/Makefile
+  '' else "";
     
   preInstall = "installFlagsArray=('LN=ln -s')";
   
@@ -21,6 +25,7 @@ stdenv.mkDerivation {
     if stdenv ? isDietLibC then
       "-UHAVE_SYS_PRCTL_H " +
       (if stdenv.system == "x86_64-linux" then "-DHAVE_LSEEK64_PROTOTYPE=1 -Dstat64=stat" else "")
+      + " -lcompat -lpthread "
     else "";
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fb5975aacf1..fb49e1b13ab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6702,6 +6702,10 @@ let
     inherit fetchurl stdenv e2fsprogs;
   };
 
+  utillinuxngCurses = composedArgsAndFun (import ../os-specific/linux/util-linux-ng) {
+    inherit fetchurl stdenv e2fsprogs ncurses;
+  };
+
   wesnoth = import ../games/wesnoth {
     inherit fetchurl stdenv SDL SDL_image SDL_mixer SDL_net gettext zlib boost freetype;
   };