Adding a busybox option to build it statically.
Adding it to the cross builds. svn path=/nixpkgs/trunk/; revision=20516
This commit is contained in:
parent
fb6adb13ac
commit
33e549fa4f
@ -1,11 +1,14 @@
|
|||||||
{stdenv, fetchurl}:
|
{stdenv, fetchurl, enableStatic ? false}:
|
||||||
|
|
||||||
let
|
let
|
||||||
basicConfigure = ''
|
basicConfigure = ''
|
||||||
make defconfig
|
make defconfig
|
||||||
sed -i 's,.*CONFIG_PREFIX.*,CONFIG_PREFIX="'$out'",' .config
|
sed -i 's,.*CONFIG_PREFIX.*,CONFIG_PREFIX="'$out'",' .config
|
||||||
sed -i 's,.*CONFIG_INSTALL_NO_USR.*,CONFIG_INSTALL_NO_USR=y,' .config
|
sed -i 's,.*CONFIG_INSTALL_NO_USR.*,CONFIG_INSTALL_NO_USR=y,' .config
|
||||||
'';
|
'' +
|
||||||
|
(if enableStatic then ''
|
||||||
|
sed -i 's,.*CONFIG_STATIC.*,CONFIG_STATIC=y,' .config
|
||||||
|
'' else "");
|
||||||
|
|
||||||
in
|
in
|
||||||
|
|
||||||
|
@ -8915,8 +8915,9 @@ let
|
|||||||
inherit stdenv fetchurl emacs texLive;
|
inherit stdenv fetchurl emacs texLive;
|
||||||
};
|
};
|
||||||
|
|
||||||
busybox = import ../misc/busybox {
|
busybox = makeOverridable (import ../misc/busybox) {
|
||||||
inherit fetchurl stdenv;
|
inherit fetchurl stdenv;
|
||||||
|
enableStatic = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
cups = import ../misc/cups {
|
cups = import ../misc/cups {
|
||||||
|
@ -5,6 +5,7 @@ let
|
|||||||
/* Basic list of packages to cross-build */
|
/* Basic list of packages to cross-build */
|
||||||
basicHostDrv = {
|
basicHostDrv = {
|
||||||
bison.hostDrv = nativePlatforms;
|
bison.hostDrv = nativePlatforms;
|
||||||
|
busybox.hostDrv = nativePlatforms;
|
||||||
tightvnc.hostDrv = nativePlatforms;
|
tightvnc.hostDrv = nativePlatforms;
|
||||||
#openoffice.hostDrv = nativePlatforms;
|
#openoffice.hostDrv = nativePlatforms;
|
||||||
wxGTK.hostDrv = nativePlatforms;
|
wxGTK.hostDrv = nativePlatforms;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user