[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

[Sergei Trofimovich]

commit:     6d35f1c6be54ecda0f93ad1a89e031e625860dc4
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 11 23:20:07 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Feb 11 23:36:15 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d35f1c6

sys-apps/nix: pass static shell into build container

Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 sys-apps/nix/{nix-2.2.1.ebuild => nix-2.2.1-r1.ebuild} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-apps/nix/nix-2.2.1.ebuild b/sys-apps/nix/nix-2.2.1-r1.ebuild
similarity index 96%
rename from sys-apps/nix/nix-2.2.1.ebuild
rename to sys-apps/nix/nix-2.2.1-r1.ebuild
index 7168bdd8d9a..dfa1ac2e7c6 100644
--- a/sys-apps/nix/nix-2.2.1.ebuild
+++ b/sys-apps/nix/nix-2.2.1-r1.ebuild
@@ -15,10 +15,12 @@ SLOT="0"
 #KEYWORDS="~amd64 ~x86"
 IUSE="+etc_profile +gc doc s3 sodium"
 
+# sys-apps/busybox is needed for sandbox mount of /bin/sh
 RDEPEND="
        app-arch/brotli
        app-arch/bzip2
        app-arch/xz-utils
+       sys-apps/busybox[static]
        dev-db/sqlite
        dev-libs/editline:0=
        dev-libs/openssl:0=
@@ -83,8 +85,6 @@ src_prepare() {
 }
 
 src_configure() {
-       local econf_args=()
-
        if ! use s3; then
                # Disable automagic depend: bug #670256
                export ac_cv_header_aws_s3_S3Client_h=no
@@ -92,7 +92,7 @@ src_configure() {
        econf \
                --localstatedir="${EPREFIX}"/nix/var \
                $(use_enable gc) \
-               "${args[@]}"
+               --with-sandbox-shell=/bin/busybox
 }
 
 src_compile() {