From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 73ECE138334 for ; Mon, 11 Feb 2019 23:36:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 32026E0844; Mon, 11 Feb 2019 23:36:38 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 03F2AE0841 for ; Mon, 11 Feb 2019 23:36:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AFCF9335D50 for ; Mon, 11 Feb 2019 23:36:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A8CDF54D for ; Mon, 11 Feb 2019 23:36:32 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1549928175.6d35f1c6be54ecda0f93ad1a89e031e625860dc4.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/nix/nix-2.2.1-r1.ebuild sys-apps/nix/nix-2.2.1.ebuild X-VCS-Directories: sys-apps/nix/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 6d35f1c6be54ecda0f93ad1a89e031e625860dc4 X-VCS-Branch: master Date: Mon, 11 Feb 2019 23:36:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4cd7ba9e-e489-4c2b-b09a-f32c93dad20b X-Archives-Hash: bd903f4114fcb39fb095a5e33bd4f4cc commit: 6d35f1c6be54ecda0f93ad1a89e031e625860dc4 Author: Sergei Trofimovich gentoo org> AuthorDate: Mon Feb 11 23:20:07 2019 +0000 Commit: Sergei Trofimovich gentoo 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 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() {