diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 8b781fa3a36..887a1c098b5 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -311,9 +311,9 @@ rec {
     inherit fetchurl stdenv ncurses;
   };
 
-  #bashDiet = (import ../shells/bash-diet) {
-  #  inherit fetchurl stdenv dietgcc;
-  #};
+  bashDiet = (import ../shells/bash-diet) {
+    inherit fetchurl stdenv dietgcc;
+  };
 
 
   ### DEVELOPMENT
@@ -467,7 +467,9 @@ rec {
       inherit stdenv dietlibc;
       gcc = stdenv.gcc;
     };
-    inherit (stdenv.gcc) binutils glibc;
+    #inherit (stdenv.gcc) binutils glibc;
+    inherit (stdenv.gcc) binutils;
+    glibc = dietlibc;
     inherit stdenv;
   };
 
@@ -887,6 +889,10 @@ rec {
     inherit fetchurl stdenv gettext;
   };
 
+  slang = (import ../development/libraries/slang) {
+    inherit fetchurl stdenv pcre libpng;
+  };
+
   cairo = (import ../development/libraries/cairo) {
     inherit fetchurl stdenv pkgconfig x11 fontconfig freetype zlib libpng;
   };
@@ -1978,6 +1984,12 @@ rec {
     x11Support = false;
   };
 
+  nixStatic = (import ../misc/nix-static) {
+    inherit fetchurl stdenv aterm perl;
+    curl = bootCurl; /* !!! ugly */
+    bdb = db4;
+  };
+
   nix = (import ../misc/nix) {
     inherit fetchurl stdenv aterm perl;
     curl = bootCurl; /* !!! ugly */