diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-07-19 04:37:14 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-07-19 05:20:02 +0300 |
| commit | 28740462e7c03b607e5ea06c3acf5a2da772fb01 (patch) | |
| tree | 6d7dfa36cf9a07b524a29c8ed9f3cb33b0e742ea /pkgs/os-specific | |
| parent | 60624a4625f8b191960b62518eac45cb912bbb4e (diff) | |
| download | nixlib-28740462e7c03b607e5ea06c3acf5a2da772fb01.tar nixlib-28740462e7c03b607e5ea06c3acf5a2da772fb01.tar.gz nixlib-28740462e7c03b607e5ea06c3acf5a2da772fb01.tar.bz2 nixlib-28740462e7c03b607e5ea06c3acf5a2da772fb01.tar.lz nixlib-28740462e7c03b607e5ea06c3acf5a2da772fb01.tar.xz nixlib-28740462e7c03b607e5ea06c3acf5a2da772fb01.tar.zst nixlib-28740462e7c03b607e5ea06c3acf5a2da772fb01.zip | |
busybox: fix static build
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/busybox/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index b04f7855fefa..92f24b9e9ae2 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, musl +{ stdenv, lib, fetchurl, glibc, musl , enableStatic ? false , enableMinimal ? false , useMusl ? false @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { CONFIG_LFS y - ${stdenv.lib.optionalString enableStatic '' + ${lib.optionalString enableStatic '' CONFIG_STATIC y ''} @@ -64,10 +64,12 @@ stdenv.mkDerivation rec { EOF make oldconfig - '' + stdenv.lib.optionalString useMusl '' + '' + lib.optionalString useMusl '' makeFlagsArray+=("CC=gcc -isystem ${musl}/include -B${musl}/lib -L${musl}/lib") ''; + buildInputs = lib.optionals (enableStatic && !useMusl) [ glibc glibc.static ]; + crossAttrs = { extraCrossConfig = '' CONFIG_CROSS_COMPILER_PREFIX "${stdenv.cross.config}-" |