MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Revert "busybox: fix static builds"

Browse source 
This reverts commit b4f6931acd.

Broke busybox-sandbox-shell

https://hydra.nixos.org/build/100470231
This commit is contained in:
Matthew Bauer 2019-09-09 17:49:10 -04:00
parent e987e3fef9
commit 78879ae0e9
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/os-specific/linux/busybox/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv, lib, buildPackages, fetchurl { stdenv, lib, buildPackages, fetchurl
, enableStatic ? false , enableStatic ? false
, enableMinimal ? false , enableMinimal ? false
, useMusl ? stdenv.hostPlatform.libc == "musl" , useMusl ? stdenv.hostPlatform.libc == "musl", musl
, extraConfig ? "" , extraConfig ? ""
}: }:
@ -88,6 +88,10 @@ stdenv.mkDerivation rec {
runHook postConfigure 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 ]; depsBuildBuild = [ buildPackages.stdenv.cc ];
buildInputs = lib.optionals (enableStatic && !useMusl && stdenv.cc.libc ? static) [ stdenv.cc.libc stdenv.cc.libc.static ]; buildInputs = lib.optionals (enableStatic && !useMusl && stdenv.cc.libc ? static) [ stdenv.cc.libc stdenv.cc.libc.static ];