diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2019-09-29 15:31:50 +0100 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2019-09-29 15:31:50 +0100 |
| commit | 64d821d9f4256fbf1215beaed27f30959d4cca39 (patch) | |
| tree | 536d3a9a559312e07ab70868319b32856c306790 /pkgs/os-specific/linux/busybox | |
| parent | e8f4b4bc27ced7618342f777c4ba20520f7f3ca0 (diff) | |
| download | nixpkgs-64d821d9f4256fbf1215beaed27f30959d4cca39.tar nixpkgs-64d821d9f4256fbf1215beaed27f30959d4cca39.tar.gz nixpkgs-64d821d9f4256fbf1215beaed27f30959d4cca39.tar.bz2 nixpkgs-64d821d9f4256fbf1215beaed27f30959d4cca39.tar.lz nixpkgs-64d821d9f4256fbf1215beaed27f30959d4cca39.tar.xz nixpkgs-64d821d9f4256fbf1215beaed27f30959d4cca39.tar.zst nixpkgs-64d821d9f4256fbf1215beaed27f30959d4cca39.zip | |
Revert "busybox: fix musl builds"
This reverts commit 5ba8c04ae51b915a18dabf2cb7d75d8a4611de4d. Broke non-musl busybox. fixes: #70007
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 da9ed304db8..f041d2b5042 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 ]; |