public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

busybox: 1.22.1 -> 1.23.2

Browse Source 
Also use musl as libc since it is just as small as uclibc, usually more
performant, and regularly makes releases.
This commit is contained in:
William A. Kennington III 2015-05-06 00:14:18 -07:00
parent dfaf86119e
commit 874fa4d8a3
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/os-specific/linux/busybox/default.nix
View File

@ -1,4 +1,9 @@
{ lib, stdenv, uclibc, fetchurl, enableStatic ? false, enableMinimal ? false, useUclibc ? false, extraConfig ? "" }: { stdenv, fetchurl, musl
, enableStatic ? false
, enableMinimal ? false
, useMusl ? false
, extraConfig ? ""
}:
let let
configParser = '' configParser = ''
@ -21,11 +26,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "busybox-1.22.1"; name = "busybox-1.23.2";
src = fetchurl { src = fetchurl {
url = "http://busybox.net/downloads/${name}.tar.bz2"; url = "http://busybox.net/downloads/${name}.tar.bz2";
sha256 = "12v7nri79v8gns3inmz4k24q7pcnwi00hybs0wddfkcy1afh42xf"; sha256 = "16ii9sqracvh2r1gfzhmlypl269nnbkpvrwa7270k35d3bigk9h5";
}; };
patches = [ ./busybox-in-store.patch ]; patches = [ ./busybox-in-store.patch ];
@ -41,7 +46,7 @@ stdenv.mkDerivation rec {
CONFIG_PREFIX "$out" CONFIG_PREFIX "$out"
CONFIG_INSTALL_NO_USR y CONFIG_INSTALL_NO_USR y
${lib.optionalString enableStatic '' ${stdenv.lib.optionalString enableStatic ''
CONFIG_STATIC y CONFIG_STATIC y
''} ''}
@ -54,8 +59,8 @@ stdenv.mkDerivation rec {
EOF EOF
make oldconfig make oldconfig
'' + lib.optionalString useUclibc '' '' + stdenv.lib.optionalString useMusl ''
makeFlagsArray+=("CC=gcc -isystem ${uclibc}/include -B${uclibc}/lib -L${uclibc}/lib") makeFlagsArray+=("CC=gcc -isystem ${musl}/include -B${musl}/lib -L${musl}/lib")
''; '';
crossAttrs = { crossAttrs = {
@ -69,11 +74,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
meta = { meta = with stdenv.lib; {
description = "Tiny versions of common UNIX utilities in a single small executable"; description = "Tiny versions of common UNIX utilities in a single small executable";
homepage = http://busybox.net/; homepage = http://busybox.net/;
license = lib.licenses.gpl2; license = licenses.gpl2;
maintainers = [ lib.maintainers.viric ]; maintainers = with maintainers; [ viric ];
platforms = lib.platforms.linux; platforms = platforms.linux;
}; };
} }

2
pkgs/stdenv/linux/make-bootstrap-tools.nix
View File

@ -17,7 +17,7 @@ rec {
}; };
busyboxMinimal = busybox.override { busyboxMinimal = busybox.override {
useUclibc = true; useMusl = true;
enableStatic = true; enableStatic = true;
enableMinimal = true; enableMinimal = true;
extraConfig = '' extraConfig = ''