Merge remote-tracking branch 'upstream/master' into hardened-stdenv

pkgs/os-specific/linux/busybox/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, musl
+{ stdenv, lib, fetchurl, glibc, musl
 , enableStatic ? false
 , enableMinimal ? false
 , useMusl ? false
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
 
     CONFIG_LFS y
 
-    ${stdenv.lib.optionalString enableStatic ''
+    ${lib.optionalString enableStatic ''
       CONFIG_STATIC y
     ''}
 
@@ -66,10 +66,12 @@ stdenv.mkDerivation rec {
     EOF
 
     make oldconfig
-  '' + stdenv.lib.optionalString useMusl ''
+  '' + lib.optionalString useMusl ''
     makeFlagsArray+=("CC=gcc -isystem ${musl}/include -B${musl}/lib -L${musl}/lib")
   '';
 
+  buildInputs = lib.optionals (enableStatic && !useMusl) [ glibc glibc.static ];
+
   crossAttrs = {
     extraCrossConfig = ''
       CONFIG_CROSS_COMPILER_PREFIX "${stdenv.cross.config}-"