Author: eelco
Date: Mon May 21 17:51:40 2012
New Revision: 34197
URL: https://nixos.org/websvn/nix/?rev=34197&sc=1
Log:
* 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.
Modified:
nixpkgs/trunk/pkgs/misc/busybox/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/misc/busybox/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/misc/busybox/default.nix Mon May 21 15:45:03 2012
(r34196)
+++ nixpkgs/trunk/pkgs/misc/busybox/default.nix Mon May 21 17:51:40 2012
(r34197)
@@ -30,9 +30,9 @@
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 @@
'' else "");
};
+ enableParallelBuilding = true;
+
meta = {
description = "Tiny versions of common UNIX utilities in a single small
executable";
homepage = http://busybox.net/;
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon May 21 15:45:03
2012 (r34196)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon May 21 17:51:40
2012 (r34197)
@@ -8336,9 +8336,7 @@
auctex = callPackage ../tools/typesetting/tex/auctex { };
- busybox = callPackage ../misc/busybox {
- enableStatic = true;
- };
+ busybox = callPackage ../misc/busybox { };
cups = callPackage ../misc/cups { };
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
