diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-11-18 09:38:27 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-11-18 09:38:27 +0000 |
commit | 536c3711867ec947c1738f2c4b96f22e4863322d (patch) | |
tree | 697733f5cb713908dcf378e13fd15a798a906a91 /sys-apps/nix/nix-2.0.4.ebuild | |
parent | f65628136faa35d0c4d3b5e7332275c7b35fcd96 (diff) |
gentoo resync : 18.11.2018
Diffstat (limited to 'sys-apps/nix/nix-2.0.4.ebuild')
-rw-r--r-- | sys-apps/nix/nix-2.0.4.ebuild | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/sys-apps/nix/nix-2.0.4.ebuild b/sys-apps/nix/nix-2.0.4.ebuild index bea6bd1a4240..965584cf6f01 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() { |