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.
This commit is contained in:
parent
b1273f2453
commit
6ec60e8c44
26
pkgs/os-specific/linux/busybox/sandbox-shell.nix
Normal file
26
pkgs/os-specific/linux/busybox/sandbox-shell.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ busybox }:
|
||||
|
||||
# Minimal shell for use as basic /bin/sh in sandbox builds
|
||||
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
|
||||
'';
|
||||
}
|
@ -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;
|
||||
|
@ -12593,6 +12593,7 @@ with pkgs;
|
||||
bridge-utils = callPackage ../os-specific/linux/bridge-utils { };
|
||||
|
||||
busybox = callPackage ../os-specific/linux/busybox { };
|
||||
busybox-sandbox-shell = callPackage ../os-specific/linux/busybox/sandbox-shell.nix { };
|
||||
|
||||
cachefilesd = callPackage ../os-specific/linux/cachefilesd { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user