summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2018-02-05 16:28:46 +0100
committerGitHub <noreply@github.com>2018-02-05 16:28:46 +0100
commitb1273f24539a9b5f50d3086b4a9f4fc3bb6c0a50 (patch)
tree4c0450fdf887fd79731bb1314f3ce39acad6f30c
parentde243f244fe28d9bde396990dbbfc5fda5742819 (diff)
parent74d928cf8b56fa33baf748d039c89985aa1fb1e7 (diff)
downloadnixpkgs-b1273f24539a9b5f50d3086b4a9f4fc3bb6c0a50.tar
nixpkgs-b1273f24539a9b5f50d3086b4a9f4fc3bb6c0a50.tar.gz
nixpkgs-b1273f24539a9b5f50d3086b4a9f4fc3bb6c0a50.tar.bz2
nixpkgs-b1273f24539a9b5f50d3086b4a9f4fc3bb6c0a50.tar.lz
nixpkgs-b1273f24539a9b5f50d3086b4a9f4fc3bb6c0a50.tar.xz
nixpkgs-b1273f24539a9b5f50d3086b4a9f4fc3bb6c0a50.tar.zst
nixpkgs-b1273f24539a9b5f50d3086b4a9f4fc3bb6c0a50.zip
Merge pull request #34628 from dtzWill/fix/nix-busybox-shell-features
nix busybox shell: fix config and enable expected features
-rw-r--r--pkgs/tools/package-management/nix/default.nix16
1 files changed, 14 insertions, 2 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 81031c0a547..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_BUILTIN_ECHO y
-      CONFIG_ASH_BUILTIN_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
     '';
   };