From 47dc6076afa6c7b919320353ac299f9551acd39e Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 5 Feb 2018 11:28:27 -0600
Subject: release-common: use shell from nixpkgs, provide fallback for compat

---
 release-common.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'release-common.nix')

diff --git a/release-common.nix b/release-common.nix
index 4553118e1f56..a4ae24ba4826 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"
-- 
cgit 1.4.1