diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-09-09 12:24:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-09 12:24:41 -0400 |
| commit | f0d6a96202061d871afa59b85759bb2baec30e13 (patch) | |
| tree | a620131ac32e6030dc5922918d006a3068bc53c6 /pkgs/os-specific | |
| parent | c2dc1b364cb9f6ad1eec1b3eb5be3523f1e58c65 (diff) | |
| parent | b4f6931acde5433ffebfedf79a31eb5903ffa51e (diff) | |
Merge pull request #67644 from NixOS/busybox-static
busybox: fix static builds
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/busybox/default.nix | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index f041d2b50429..da9ed304db88 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", musl +, useMusl ? stdenv.hostPlatform.libc == "musl" , extraConfig ? "" }: @@ -88,10 +88,6 @@ 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 ]; |