From 4e735835e01a85ba29a6e1a8b5161e4a495e42da Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 5 Sep 2018 14:35:15 +0000 Subject: nix: make AWS support optional --- pkgs/tools/package-management/nix/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/package-management/nix') diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 74e3963b733f..7b4517624164 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl, fetchFromGitHub, fetchpatch, perl, curl, bzip2, sqlite, openssl ? null, xz -, pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli, boost +, pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns , busybox-sandbox-shell , storeDir ? "/nix/store" , stateDir ? "/nix/var" , confDir ? "/etc" , withLibseccomp ? libseccomp.meta.available, libseccomp +, withAWS ? stdenv.isLinux || stdenv.isDarwin, aws-sdk-cpp }: let @@ -31,7 +32,7 @@ let ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium ++ lib.optionals is20 [ brotli boost ] ++ lib.optional withLibseccomp libseccomp - ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is20) + ++ lib.optional (withAWS && is20) ((aws-sdk-cpp.override { apis = ["s3" "transfer"]; customMemoryManagement = false; -- cgit 1.4.1