From 1a22e9761d34254d88a12b3290be7b5843bf131f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 21 May 2012 17:51:40 +0000
Subject: * 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
---
 pkgs/misc/busybox/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'pkgs/misc/busybox/default.nix')

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/;
-- 
cgit 1.4.1