about summary refs log tree commit diff
path: root/release.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2016-05-04T15·16+0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2016-05-04T15·16+0200
commit75d2492f20dc513337de3ef2d45e1d5c68c7dff8 (patch)
tree61c9ee0856ef91bc3e4c524eeccf845828ccf9ad /release.nix
parent16d9c872e41eb39248d88a3ba7c5706267676153 (diff)
Make the aws-cpp-sdk dependency optional
Diffstat (limited to 'release.nix')
-rw-r--r--release.nix11
1 files changed, 5 insertions, 6 deletions
diff --git a/release.nix b/release.nix
index 6fab352b2687..4803788fe009 100644
--- a/release.nix
+++ b/release.nix
@@ -27,6 +27,7 @@ let
           [ curl bison flex perl libxml2 libxslt bzip2 xz
             pkgconfig sqlite libsodium
             docbook5 docbook5_xsl
+            autoconf-archive
           ] ++ lib.optional (!lib.inNixShell) git;
 
         configureFlags = ''
@@ -71,15 +72,13 @@ let
         src = tarball;
 
         buildInputs =
-          [ curl perl bzip2 xz openssl pkgconfig sqlite boehmgc
-
+          [ curl perl bzip2 xz openssl pkgconfig sqlite boehmgc ]
+          ++ lib.optional stdenv.isLinux libsodium
+          ++ lib.optional stdenv.isLinux
             (aws-sdk-cpp.override {
               apis = ["s3"];
               customMemoryManagement = false;
-            })
-
-          ]
-          ++ lib.optional stdenv.isLinux libsodium;
+            });
 
         configureFlags = ''
           --disable-init-state