diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-09-09 17:49:10 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-09-09 17:49:10 -0400 |
| commit | 78879ae0e99a00d5abadb16c6bc1d20c517dffcf (patch) | |
| tree | 489a5a47c2c802dc314023e669fecb48d1ae76b1 /pkgs/os-specific/linux/busybox | |
| parent | e987e3fef9b4538d72f3e7704db15fecb66a5faf (diff) | |
| download | nixlib-78879ae0e99a00d5abadb16c6bc1d20c517dffcf.tar nixlib-78879ae0e99a00d5abadb16c6bc1d20c517dffcf.tar.gz nixlib-78879ae0e99a00d5abadb16c6bc1d20c517dffcf.tar.bz2 nixlib-78879ae0e99a00d5abadb16c6bc1d20c517dffcf.tar.lz nixlib-78879ae0e99a00d5abadb16c6bc1d20c517dffcf.tar.xz nixlib-78879ae0e99a00d5abadb16c6bc1d20c517dffcf.tar.zst nixlib-78879ae0e99a00d5abadb16c6bc1d20c517dffcf.zip | |
Revert "busybox: fix static builds"
This reverts commit b4f6931acde5433ffebfedf79a31eb5903ffa51e. Broke busybox-sandbox-shell https://hydra.nixos.org/build/100470231
Diffstat (limited to 'pkgs/os-specific/linux/busybox')
| -rw-r--r-- | pkgs/os-specific/linux/busybox/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index da9ed304db88..f041d2b50429 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, buildPackages, fetchurl , enableStatic ? false , enableMinimal ? false -, useMusl ? stdenv.hostPlatform.libc == "musl" +, useMusl ? stdenv.hostPlatform.libc == "musl", musl , extraConfig ? "" }: @@ -88,6 +88,10 @@ stdenv.mkDerivation rec { runHook postConfigure ''; + postConfigure = lib.optionalString useMusl '' + makeFlagsArray+=("CC=${stdenv.cc.targetPrefix}cc -isystem ${musl.dev}/include -B${musl}/lib -L${musl}/lib") + ''; + depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = lib.optionals (enableStatic && !useMusl && stdenv.cc.libc ? static) [ stdenv.cc.libc stdenv.cc.libc.static ]; |