summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorYegor Timoshenko <yegortimoshenko@riseup.net>2019-05-22 03:08:04 +0300
committerGitHub <noreply@github.com>2019-05-22 03:08:04 +0300
commit4dd5c93998da55002fdec1c715c680531420381c (patch)
treee482b212dfaf14640dc18987816d1a2b4ed841af /pkgs
parent6bba2572c3bcfa75c73b8bd9db3f192010bb89c5 (diff)
parent2d8b3df99b9f034391c8f268b84175786cca8f33 (diff)
downloadnixpkgs-4dd5c93998da55002fdec1c715c680531420381c.tar
nixpkgs-4dd5c93998da55002fdec1c715c680531420381c.tar.gz
nixpkgs-4dd5c93998da55002fdec1c715c680531420381c.tar.bz2
nixpkgs-4dd5c93998da55002fdec1c715c680531420381c.tar.lz
nixpkgs-4dd5c93998da55002fdec1c715c680531420381c.tar.xz
nixpkgs-4dd5c93998da55002fdec1c715c680531420381c.tar.zst
nixpkgs-4dd5c93998da55002fdec1c715c680531420381c.zip
Merge pull request #61519 from erictapen/aws-sdk-cpp-cross-fix
aws-sdk-cpp: fix cross compilation
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/aws-sdk-cpp/default.nix8
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index f46571587ef..7233a187053 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -37,9 +37,11 @@ stdenv.mkDerivation rec {
     "-DBUILD_DEPS=OFF"
     "-DCMAKE_SKIP_BUILD_RPATH=OFF"
   ] ++ lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0"
-    ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "-DENABLE_TESTING=OFF"
-    ++ lib.optional (apis != ["*"])
-      "-DBUILD_ONLY=${lib.concatStringsSep ";" apis}";
+  ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+    "-DENABLE_TESTING=OFF"
+    "-DCURL_HAS_H2=0"
+  ] ++ lib.optional (apis != ["*"])
+    "-DBUILD_ONLY=${lib.concatStringsSep ";" apis}";
 
   preConfigure =
     ''