1 |
commit: 6d35f1c6be54ecda0f93ad1a89e031e625860dc4 |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Feb 11 23:20:07 2019 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 11 23:36:15 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d35f1c6 |
7 |
|
8 |
sys-apps/nix: pass static shell into build container |
9 |
|
10 |
Package-Manager: Portage-2.3.59, Repoman-2.3.12 |
11 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
12 |
|
13 |
sys-apps/nix/{nix-2.2.1.ebuild => nix-2.2.1-r1.ebuild} | 6 +++--- |
14 |
1 file changed, 3 insertions(+), 3 deletions(-) |
15 |
|
16 |
diff --git a/sys-apps/nix/nix-2.2.1.ebuild b/sys-apps/nix/nix-2.2.1-r1.ebuild |
17 |
similarity index 96% |
18 |
rename from sys-apps/nix/nix-2.2.1.ebuild |
19 |
rename to sys-apps/nix/nix-2.2.1-r1.ebuild |
20 |
index 7168bdd8d9a..dfa1ac2e7c6 100644 |
21 |
--- a/sys-apps/nix/nix-2.2.1.ebuild |
22 |
+++ b/sys-apps/nix/nix-2.2.1-r1.ebuild |
23 |
@@ -15,10 +15,12 @@ SLOT="0" |
24 |
#KEYWORDS="~amd64 ~x86" |
25 |
IUSE="+etc_profile +gc doc s3 sodium" |
26 |
|
27 |
+# sys-apps/busybox is needed for sandbox mount of /bin/sh |
28 |
RDEPEND=" |
29 |
app-arch/brotli |
30 |
app-arch/bzip2 |
31 |
app-arch/xz-utils |
32 |
+ sys-apps/busybox[static] |
33 |
dev-db/sqlite |
34 |
dev-libs/editline:0= |
35 |
dev-libs/openssl:0= |
36 |
@@ -83,8 +85,6 @@ src_prepare() { |
37 |
} |
38 |
|
39 |
src_configure() { |
40 |
- local econf_args=() |
41 |
- |
42 |
if ! use s3; then |
43 |
# Disable automagic depend: bug #670256 |
44 |
export ac_cv_header_aws_s3_S3Client_h=no |
45 |
@@ -92,7 +92,7 @@ src_configure() { |
46 |
econf \ |
47 |
--localstatedir="${EPREFIX}"/nix/var \ |
48 |
$(use_enable gc) \ |
49 |
- "${args[@]}" |
50 |
+ --with-sandbox-shell=/bin/busybox |
51 |
} |
52 |
|
53 |
src_compile() { |