* By default, build a dynamically linked Busybox. In the initrd we

  need Glibc anyway, so there is no point in static linking.  This
  saves about a megabyte from the initrd.

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

2 files changed, 6 insertions, 6 deletions

diff --git a/pkgs/misc/busybox/default.nix b/pkgs/misc/busybox/default.nix
index ce42a156605..2f876c98d6b 100644
--- a/pkgs/misc/busybox/default.nix
+++ b/pkgs/misc/busybox/default.nix
@@ -30,9 +30,9 @@ let
     CONFIG_INSTALL_NO_USR y
   '';
 
-  staticConfig = (if enableStatic then ''
-      CONFIG_STATIC y
-    '' else "");
+  staticConfig = stdenv.lib.optionalString enableStatic ''
+    CONFIG_STATIC y
+  '';
 
 in
 
@@ -65,6 +65,8 @@ stdenv.mkDerivation rec {
       '' else "");
   };
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "Tiny versions of common UNIX utilities in a single small executable";
     homepage = http://busybox.net/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cdfad9837fa..7df281dc9f9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8336,9 +8336,7 @@ let
 
   auctex = callPackage ../tools/typesetting/tex/auctex { };
 
-  busybox = callPackage ../misc/busybox {
-    enableStatic = true;
-  };
+  busybox = callPackage ../misc/busybox { };
 
   cups = callPackage ../misc/cups { };