summaryrefslogtreecommitdiff
path: root/sys-apps/nix
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-02-16 12:59:29 +0000
committerV3n3RiX <venerix@redcorelinux.org>2019-02-16 12:59:29 +0000
commit79599515788b85b18aa655e7b7f8cc05c1bbddd8 (patch)
treeade7cb031f363fad64c77139dea7aa3d81908537 /sys-apps/nix
parent6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (diff)
gentoo resync : 16.02.1018
Diffstat (limited to 'sys-apps/nix')
-rw-r--r--sys-apps/nix/Manifest2
-rw-r--r--sys-apps/nix/nix-2.2.1-r1.ebuild (renamed from sys-apps/nix/nix-2.2.1.ebuild)6
2 files changed, 4 insertions, 4 deletions
diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 558d63d78e99..5fb5d0a2ae80 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -10,5 +10,5 @@ DIST nix-2.2.1.tar.xz 818648 BLAKE2B 2e836bd40ea1ee22c308bd287b1ad1e5607729574b5
EBUILD nix-2.0.2.ebuild 3110 BLAKE2B d7930a0e21775cb2d531621f4ce6dbc52a2b7d4a437506bedd19bf34694bed08c99aec4e36b017af283bdf5c3069b757b68a9b45549d3fc42beec59c29aa79de SHA512 234a27599be84a79a035c1c9a7633ba85c36f44e4fd53f104d981bc4795f8ff59de68768e21b722735c760e2a8bbb9714d562a2d13c8be4a0014b4c819ef9d48
EBUILD nix-2.0.4.ebuild 3288 BLAKE2B 7c2fc988eb075af7977e0a2252357779382856c288e6e9aedfe00a414726c7fc933dd4393fa9851b6b2c1fc1d5f57b20f4fdeec99debc50401f6651ae6b9dfd1 SHA512 729b481d24a1af5d9465820d4531ee807a37a9a7cfef8551de5e4f1464a2f50d803915c2eae332e2be8a05954b48838c72216631747ca2f5385df2c18aef1a48
EBUILD nix-2.1.3.ebuild 3359 BLAKE2B f91cae5d9562ea976222b7f893d4beba3f2f99967dac16381270afe69ecda3df6ffbf1896fe487999c80648477ac22431dc3af9cd3b7fcf09778bc92f9f1c0fa SHA512 f6c9c8a0b1fd25e5484f6c13e9c564868b432c84961e600ae9b3cdb5646c2e4286b8cd6b5dff43f63c58646583d70c6445ce61530f143f4654903bb8e1380971
-EBUILD nix-2.2.1.ebuild 3381 BLAKE2B 18d3b3f7e41c392eadc6822d1d41e39e77633bc976808b8558959c4574558eb7bb76a30c4f20db4b1f89a414dc1f7af364f9e0588492d6ab43323870c7a55d98 SHA512 ec965c3cccf7e9886ead9fa44eaa54f743d1726abc073825e823c95a883a9182eb26c05af4021ac2a0a9c75e6b78af369f605b803849795ceb4236314c784645
+EBUILD nix-2.2.1-r1.ebuild 3464 BLAKE2B 9b8dc5694712babc5f87aada82909f5b5cbfe93528a4bba3a9b55f051ca8365bdc0ff9aaf8dbf5c12daee85e98c0d527085c2441064961f0fe8d21a0ceba43d3 SHA512 21441ce424c2c667ae2df383e2f41551b907218aa473b85ac3a91e9b8c744d6ed5ed57e24276f9185937eb4430f04992a4f5e34938d26143f4fdd981f742b596
MISC metadata.xml 681 BLAKE2B 53ec9e4c35af4d73756dabebcc9d0423c3708c24e085d35ec589334971d2b76b40408793b5202d625043fe3bd23399a457b7cae4eea665156e2ba3c0d60fc292 SHA512 b473a72e96cc53eeca793b60acd627ebafb918a05fc328126d3a3f32fe8f09d95ebd4643c17f27a69ac64c0b3bee87f6c0818b0316ab2e5e7158999adc8e8a94
diff --git a/sys-apps/nix/nix-2.2.1.ebuild b/sys-apps/nix/nix-2.2.1-r1.ebuild
index 7168bdd8d9a3..dfa1ac2e7c6d 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() {