diff options
| author | Will Dietz <w@wdtz.org> | 2018-02-05 11:28:27 -0600 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-02-05 11:33:18 -0600 |
| commit | 47dc6076afa6c7b919320353ac299f9551acd39e (patch) | |
| tree | 2632a61f0b7dbb395cb486d837aaec552c7eb88a | |
| parent | 84722d67d2b09b5c28e1c2d9dd438ba592df2296 (diff) | |
release-common: use shell from nixpkgs, provide fallback for compat
| -rw-r--r-- | release-common.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/release-common.nix b/release-common.nix index 4553118e1..a4ae24ba4 100644 --- a/release-common.nix +++ b/release-common.nix @@ -1,7 +1,9 @@ { pkgs }: rec { - sh = pkgs.busybox.override { + # Use "busybox-sandbox-shell" if present, + # if not (legacy) fallback and hope it's sufficient. + sh = pkgs.busybox-sandbox-shell or (pkgs.busybox.override { useMusl = true; enableStatic = true; enableMinimal = true; @@ -11,7 +13,7 @@ rec { CONFIG_ASH_TEST y CONFIG_ASH_OPTIMIZE_FOR_SIZE y ''; - }; + }); configureFlags = [ "--disable-init-state" |