From 4faac207bc3614d0700e33bd175f38fdfe423f0d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 4 Feb 2018 15:58:08 -0600 Subject: [PATCH 1/2] nix: fix config for echo/test on newer busybox Matches https://github.com/NixOS/nix/commit/2f1a1c5a49b50594a4aa9d4729a5b64255dd0932 --- pkgs/tools/package-management/nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 81031c0a547..f733be5fd00 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -16,8 +16,8 @@ let enableMinimal = true; extraConfig = '' CONFIG_ASH y - CONFIG_ASH_BUILTIN_ECHO y - CONFIG_ASH_BUILTIN_TEST y + CONFIG_ASH_ECHO y + CONFIG_ASH_TEST y CONFIG_ASH_OPTIMIZE_FOR_SIZE y ''; }; From 74d928cf8b56fa33baf748d039c89985aa1fb1e7 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 5 Feb 2018 09:19:54 -0600 Subject: [PATCH 2/2] nix: enable more features in busybox shell to resolve build failures --- pkgs/tools/package-management/nix/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index f733be5fd00..1e53f450964 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -15,10 +15,22 @@ let enableStatic = true; enableMinimal = true; extraConfig = '' + CONFIG_FEATURE_FANCY_ECHO y + CONFIG_FEATURE_SH_MATH y + CONFIG_FEATURE_SH_MATH_64 y + CONFIG_ASH y - CONFIG_ASH_ECHO y - CONFIG_ASH_TEST y CONFIG_ASH_OPTIMIZE_FOR_SIZE y + + CONFIG_ASH_ALIAS y + CONFIG_ASH_BASH_COMPAT y + CONFIG_ASH_CMDCMD y + CONFIG_ASH_ECHO y + CONFIG_ASH_GETOPTS y + CONFIG_ASH_INTERNAL_GLOB y + CONFIG_ASH_JOB_CONTROL y + CONFIG_ASH_PRINTF y + CONFIG_ASH_TEST y ''; };