Merge pull request #34207 from dtzWill/fix/busybox-misc

busybox: bump copybuf, disable utmp/wtmp when not supported (musl)

Changed files
+11 -1
pkgs
os-specific
linux
busybox
+11 -1
pkgs/os-specific/linux/busybox/default.nix
···
{ stdenv, lib, buildPackages, fetchurl, fetchpatch
, enableStatic ? false
, enableMinimal ? false
-
, useMusl ? false, musl
+
, useMusl ? stdenv.hostPlatform.libc == "musl", musl
, extraConfig ? ""
, buildPlatform, hostPlatform
}:
+
+
assert stdenv.hostPlatform.libc == "musl" -> useMusl;
let
configParser = ''
···
}
'';
+
libcConfig = lib.optionalString useMusl ''
+
CONFIG_FEATURE_UTMP n
+
CONFIG_FEATURE_WTMP n
+
'';
in
stdenv.mkDerivation rec {
···
# Set paths for console fonts.
CONFIG_DEFAULT_SETFONT_DIR "/etc/kbd"
+
# Bump from 4KB, much faster I/O
+
CONFIG_FEATURE_COPYBUF_KB 64
+
${extraConfig}
CONFIG_CROSS_COMPILER_PREFIX "${stdenv.cc.targetPrefix}"
+
${libcConfig}
EOF
make oldconfig