alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #67644 from NixOS/busybox-static

Browse source 
busybox: fix static builds
This commit is contained in:
Matthew Bauer 2019-09-09 12:24:41 -04:00 committed by GitHub
parent c2dc1b364c b4f6931acd
commit f0d6a96202
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 5 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
, 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 ];