From 5ba8c04ae51b915a18dabf2cb7d75d8a4611de4d Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 12 Feb 2019 22:34:37 -0500 Subject: busybox: fix musl builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit You shouldn’t need to add anything with musl builds. The libc will configure these values for you. --- pkgs/os-specific/linux/busybox/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'pkgs/os-specific/linux/busybox') 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 ]; -- cgit 1.4.1