diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-06-12 09:59:45 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-06-18 18:14:17 +0000 |
commit | c5571a126859eb658ffd7340cb580f7d91f12bb6 (patch) | |
tree | 577573c3bf14d9849246d52daece719a10eaf138 /nixpkgs/pkgs/development/libraries/aws-sdk-cpp | |
parent | 828bd4e8ddcbcd354ddfd99f55af69ee8ff5d9e7 (diff) | |
parent | 98e3b90b6c8f400ae5438ef868eb992a64b75ce5 (diff) | |
download | nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.gz nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.bz2 nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.lz nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.xz nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.zst nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.zip |
Merge commit '98e3b90b6c8f400ae5438ef868eb992a64b75ce5'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/aws-sdk-cpp')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix b/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix index f46571587efd..7233a187053e 100644 --- a/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/nixpkgs/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 = '' |