cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #70023 from Mic92/busybox

Browse source 
Revert "busybox: fix musl builds"
This commit is contained in:
Jörg Thalheim 2019-09-29 15:36:01 +01:00 committed by GitHub
commit a702db71a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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 ];