add dietlibc wrapper and build e2fsprogs with dietlibc. This cost some time because it was first mislinked to glibc (grrrr Eelco, this will cost you a beer!)

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

1 files changed, 20 insertions, 0 deletions

diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 87b1e388629..1cab12cdd2d 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -381,6 +381,17 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  dietgcc = (import ../build-support/gcc-wrapper) {
+    nativeTools = false;
+    nativeGlibc = false;
+    gcc = (import ../os-specific/linux/dietlibc-wrapper) {
+      inherit stdenv dietlibc;
+      gcc = stdenv.gcc;
+    };
+    inherit (stdenv.gcc) binutils glibc;
+    inherit stdenv;
+  };
+
   gcc33 = (import ../build-support/gcc-wrapper) {
     nativeTools = false;
     nativeGlibc = false;
@@ -1093,6 +1104,11 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  dietlibcWrapper = (import ../os-specific/linux/dietlibc-wrapper) {
+    inherit stdenv dietlibc;
+    gcc = stdenv.gcc;
+  };
+
   hwdata = (import ../os-specific/linux/hwdata) {
     inherit fetchurl stdenv;
   };
@@ -1137,6 +1153,10 @@ rec {
     inherit fetchurl stdenv gettext;
   };
 
+  e2fsprogsDiet = (import ../os-specific/linux/e2fsprogs-diet) {
+    inherit fetchurl stdenv gettext dietgcc;
+  };
+
   nettools = (import ../os-specific/linux/net-tools) {
     inherit fetchurl stdenv;
   };