diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-02-12 22:34:37 -0500 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2019-09-29 11:19:56 +0200 |
| commit | 5ba8c04ae51b915a18dabf2cb7d75d8a4611de4d (patch) | |
| tree | c09577bd934c1f881801598590661434f9931614 /pkgs/os-specific/linux/busybox | |
| parent | 85210e13e5a3307448bb3d50095ad0d91a64d828 (diff) | |
| download | nixpkgs-5ba8c04ae51b915a18dabf2cb7d75d8a4611de4d.tar nixpkgs-5ba8c04ae51b915a18dabf2cb7d75d8a4611de4d.tar.gz nixpkgs-5ba8c04ae51b915a18dabf2cb7d75d8a4611de4d.tar.bz2 nixpkgs-5ba8c04ae51b915a18dabf2cb7d75d8a4611de4d.tar.lz nixpkgs-5ba8c04ae51b915a18dabf2cb7d75d8a4611de4d.tar.xz nixpkgs-5ba8c04ae51b915a18dabf2cb7d75d8a4611de4d.tar.zst nixpkgs-5ba8c04ae51b915a18dabf2cb7d75d8a4611de4d.zip | |
busybox: fix musl builds
You shouldn’t need to add anything with musl builds. The libc will configure these values for you.
Diffstat (limited to 'pkgs/os-specific/linux/busybox')
| -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 f041d2b5042..da9ed304db8 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 ]; |