public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sergei Trofimovich" <slyfox@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/
Date: Mon, 11 Feb 2019 23:36:32 +0000 (UTC)	[thread overview]
Message-ID: <1549928175.6d35f1c6be54ecda0f93ad1a89e031e625860dc4.slyfox@gentoo> (raw)

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() {


             reply	other threads:[~2019-02-11 23:36 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-11 23:36 Sergei Trofimovich [this message]
  -- strict thread matches above, loose matches on Subject: below --
2019-10-13 11:57 [gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/ Sergei Trofimovich
2019-10-10 22:35 Sergei Trofimovich
2019-10-10 22:35 Sergei Trofimovich
2019-09-20 22:44 Sergei Trofimovich
2019-09-07  8:03 Sergei Trofimovich
2019-08-11 11:20 David Seifert
2019-06-30 20:35 Sergei Trofimovich
2019-06-30 20:35 Sergei Trofimovich
2019-05-15  7:21 Sergei Trofimovich
2019-04-26 15:47 Sergei Trofimovich
2019-01-12 12:59 Sergei Trofimovich
2018-11-04 22:50 Sergei Trofimovich
2018-10-02 21:29 Sergei Trofimovich
2018-10-02 21:29 Sergei Trofimovich
2018-09-19 22:59 Sergei Trofimovich
2018-09-19 22:59 Sergei Trofimovich
2018-09-06 22:37 Sergei Trofimovich
2018-09-06 22:37 Sergei Trofimovich
2018-09-04  8:19 Sergei Trofimovich
2018-06-08 15:31 Sergei Trofimovich
2018-06-08 15:31 Sergei Trofimovich
2018-05-04 22:24 Sergei Trofimovich
2018-04-20 22:16 Sergei Trofimovich
2017-12-21  8:01 Sergei Trofimovich
2017-09-15 20:50 Sergei Trofimovich
2017-09-15 20:50 Sergei Trofimovich
2017-07-18 20:15 Sergei Trofimovich
2017-07-18 20:15 Sergei Trofimovich
2017-07-13 18:42 Sergei Trofimovich
2017-06-19 20:27 Sergei Trofimovich
2017-06-12 21:23 Sergei Trofimovich
2017-05-07 13:10 Michał Górny
2017-05-07 11:22 Sergei Trofimovich
2017-05-07 11:22 Sergei Trofimovich
2017-04-17 17:38 Sergei Trofimovich
2017-02-02 21:18 Sergei Trofimovich
2017-02-01 22:18 Sergei Trofimovich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1549928175.6d35f1c6be54ecda0f93ad1a89e031e625860dc4.slyfox@gentoo \
    --to=slyfox@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox