diff options
| author | Will Dietz <w@wdtz.org> | 2018-02-05 11:26:01 -0600 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-02-05 11:26:01 -0600 |
| commit | 6ec60e8c4446c5093fff01a810ed30ed94d7603d (patch) | |
| tree | aed69eb310c9446764296c0ba946b5e059c0bfe6 /pkgs/tools | |
| parent | b1273f24539a9b5f50d3086b4a9f4fc3bb6c0a50 (diff) | |
| download | nixlib-6ec60e8c4446c5093fff01a810ed30ed94d7603d.tar nixlib-6ec60e8c4446c5093fff01a810ed30ed94d7603d.tar.gz nixlib-6ec60e8c4446c5093fff01a810ed30ed94d7603d.tar.bz2 nixlib-6ec60e8c4446c5093fff01a810ed30ed94d7603d.tar.lz nixlib-6ec60e8c4446c5093fff01a810ed30ed94d7603d.tar.xz nixlib-6ec60e8c4446c5093fff01a810ed30ed94d7603d.tar.zst nixlib-6ec60e8c4446c5093fff01a810ed30ed94d7603d.zip | |
busybox-sandbox-shell: extract basic shell to new attribute
Nix will use this shell if the attribute is present, avoiding duplicating changes in the future.
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 1e53f4509645..3f77e47868b8 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, fetchFromGitHub, perl, curl, bzip2, sqlite, openssl ? null, xz , pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook5_xsl -, libseccomp, busybox +, libseccomp, busybox-sandbox-shell , hostPlatform , storeDir ? "/nix/store" , stateDir ? "/nix/var" @@ -10,29 +10,7 @@ let - sh = busybox.override { - useMusl = true; - 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_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 - ''; - }; + sh = busybox-sandbox-shell; common = { name, suffix ? "", src, fromGit ? false }: stdenv.mkDerivation rec { inherit name src; |