diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-02-10 13:38:43 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-10 13:38:43 +0000 |
| commit | c69686e645b69fdbac9ccc57edd34330600e66a1 (patch) | |
| tree | 97ebb82327fa53068cfea9db764ecc14ff63e542 /pkgs/os-specific/linux/busybox | |
| parent | c6bd88155e572bf20193be270bc6a75e40527764 (diff) | |
| parent | 329db7b49053245875e79fbc3dbe26755759dce8 (diff) | |
| download | nixlib-c69686e645b69fdbac9ccc57edd34330600e66a1.tar nixlib-c69686e645b69fdbac9ccc57edd34330600e66a1.tar.gz nixlib-c69686e645b69fdbac9ccc57edd34330600e66a1.tar.bz2 nixlib-c69686e645b69fdbac9ccc57edd34330600e66a1.tar.lz nixlib-c69686e645b69fdbac9ccc57edd34330600e66a1.tar.xz nixlib-c69686e645b69fdbac9ccc57edd34330600e66a1.tar.zst nixlib-c69686e645b69fdbac9ccc57edd34330600e66a1.zip | |
Merge pull request #34207 from dtzWill/fix/busybox-misc
busybox: bump copybuf, disable utmp/wtmp when not supported (musl)
Diffstat (limited to 'pkgs/os-specific/linux/busybox')
| -rw-r--r-- | pkgs/os-specific/linux/busybox/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index a8d5ab48ac21..5a485cdcf9fe 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -1,11 +1,13 @@ { 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 = '' function parseconfig { @@ -24,6 +26,10 @@ let } ''; + libcConfig = lib.optionalString useMusl '' + CONFIG_FEATURE_UTMP n + CONFIG_FEATURE_WTMP n + ''; in stdenv.mkDerivation rec { @@ -67,8 +73,12 @@ 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 |