diff options
| author | Shea Levy <shea@shealevy.com> | 2018-02-06 14:01:22 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2018-02-06 14:01:22 -0500 |
| commit | 694b6d229bb5fb7edcef37380308850d3d48b991 (patch) | |
| tree | 45e10d7526291a10381390bb13e685c6bcebe064 | |
| parent | 43f8ef73c6aeb23aee40d485556004d6262d4e3b (diff) | |
| parent | 47dc6076afa6c7b919320353ac299f9551acd39e (diff) | |
Merge branch 'fix/busybox-sandbox-shell-attribute' of git://github.com/dtzWill/nix
| -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" |