commit: f7baa33d5fef62f96a594cfac8b1e1e86e91c949 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Sun Nov 4 22:49:58 2018 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Sun Nov 4 22:50:17 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7baa33d
sys-apps/nix: add USE=s3 for AWS S3support, bug #670256 Disable automagic autodetection of S3 backend. Does not fix originally reported build failure in bug #670256 yet. Reported-by: Toralf Förster Bug: https://bugs.gentoo.org/670256 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 sys-apps/nix/metadata.xml | 1 + sys-apps/nix/nix-2.0.4.ebuild | 15 ++++++++++++--- sys-apps/nix/nix-2.1.3.ebuild | 12 ++++++++++-- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/sys-apps/nix/metadata.xml b/sys-apps/nix/metadata.xml index ad64c7e5102..c7035d7472f 100644 --- a/sys-apps/nix/metadata.xml +++ b/sys-apps/nix/metadata.xml @@ -8,6 +8,7 @@ <use> <flag name="etc_profile">Install /etc/profile.d/ entry to inject nix support for all users.</flag> <flag name="gc">Enable garbage collection in the Nix expression evaluator (use <pkg>dev-libs/boehm-gc</pkg>).</flag> + <flag name="s3">Enable Amazon S3 bucket to load and store packages (use <pkg>dev-libs/aws-sdk-cpp</pkg>).</flag> <flag name="sodium">Use <pkg>dev-libs/libsodium</pkg> for cryptography</flag> </use> </pkgmetadata> diff --git a/sys-apps/nix/nix-2.0.4.ebuild b/sys-apps/nix/nix-2.0.4.ebuild index bea6bd1a424..965584cf6f0 100644 --- a/sys-apps/nix/nix-2.0.4.ebuild +++ b/sys-apps/nix/nix-2.0.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,7 +12,7 @@ SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz"; LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="+etc_profile +gc doc sodium" +IUSE="+etc_profile +gc doc s3 sodium" RDEPEND=" app-arch/brotli @@ -28,6 +28,7 @@ RDEPEND=" dev-libs/libxslt app-text/docbook-xsl-stylesheets ) + s3? ( dev-libs/aws-sdk-cpp ) sodium? ( dev-libs/libsodium:0= ) " DEPEND="${RDEPEND} @@ -79,9 +80,17 @@ 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 + fi + econf \ --localstatedir="${EPREFIX}"/nix/var \ - $(use_enable gc) + $(use_enable gc) \ + "${args[@]}" } src_compile() { diff --git a/sys-apps/nix/nix-2.1.3.ebuild b/sys-apps/nix/nix-2.1.3.ebuild index a104f3b883a..4eb0d459fc8 100644 --- a/sys-apps/nix/nix-2.1.3.ebuild +++ b/sys-apps/nix/nix-2.1.3.ebuild @@ -13,7 +13,7 @@ LICENSE="LGPL-2.1" SLOT="0" #keywords are blocked by boost-1.66 #KEYWORDS="~amd64 ~x86" -IUSE="+etc_profile +gc doc sodium" +IUSE="+etc_profile +gc doc s3 sodium" RDEPEND=" app-arch/brotli @@ -30,6 +30,7 @@ RDEPEND=" dev-libs/libxslt app-text/docbook-xsl-stylesheets ) + s3? ( dev-libs/aws-sdk-cpp ) sodium? ( dev-libs/libsodium:0= ) " DEPEND="${RDEPEND} @@ -81,9 +82,16 @@ 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 + fi econf \ --localstatedir="${EPREFIX}"/nix/var \ - $(use_enable gc) + $(use_enable gc) \ + "${args[@]}" } src_compile() {
