diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2021-05-04 22:31:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-04 22:31:30 -0500 |
| commit | 8b51a45a551ce23cd1e3fc64b49769b599081c26 (patch) | |
| tree | cc759a41bd4b8a90d85c8e25a555ec254842b76d /pkgs/development | |
| parent | 9742ac3b1ba57438675be3a2c115cb6f58130be4 (diff) | |
| parent | 6255468c4e648f48ea49efc9ba598bce5ec768b8 (diff) | |
| download | nixpkgs-8b51a45a551ce23cd1e3fc64b49769b599081c26.tar nixpkgs-8b51a45a551ce23cd1e3fc64b49769b599081c26.tar.gz nixpkgs-8b51a45a551ce23cd1e3fc64b49769b599081c26.tar.bz2 nixpkgs-8b51a45a551ce23cd1e3fc64b49769b599081c26.tar.lz nixpkgs-8b51a45a551ce23cd1e3fc64b49769b599081c26.tar.xz nixpkgs-8b51a45a551ce23cd1e3fc64b49769b599081c26.tar.zst nixpkgs-8b51a45a551ce23cd1e3fc64b49769b599081c26.zip | |
Merge pull request #116099 from matthewbauer/fix-aws-sdk-cpp-on-big-sur-2
aws-sdk-cpp: propagate Security framework
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/aws-c-cal/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/aws-c-io/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/libraries/aws-sdk-cpp/default.nix | 5 |
3 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/development/libraries/aws-c-cal/default.nix b/pkgs/development/libraries/aws-c-cal/default.nix index 057aad447d5..3246c572962 100644 --- a/pkgs/development/libraries/aws-c-cal/default.nix +++ b/pkgs/development/libraries/aws-c-cal/default.nix @@ -13,7 +13,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ aws-c-common openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ aws-c-common openssl ]; + + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix index 337149e6f8e..39230cc088d 100644 --- a/pkgs/development/libraries/aws-c-io/default.nix +++ b/pkgs/development/libraries/aws-c-io/default.nix @@ -13,15 +13,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ aws-c-cal aws-c-common s2n-tls] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ aws-c-cal aws-c-common s2n-tls]; + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake" ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error"; - meta = with lib; { description = "AWS SDK for C module for IO and TLS"; homepage = "https://github.com/awslabs/aws-c-io"; diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 7fd7b2fbbdd..dd215dc01c5 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -26,12 +26,15 @@ stdenv.mkDerivation rec { buildInputs = [ curl openssl s2n-tls zlib - aws-c-cal aws-c-common aws-c-event-stream aws-c-io aws-checksums + aws-c-common aws-c-event-stream aws-checksums ] ++ lib.optionals (stdenv.isDarwin && ((builtins.elem "text-to-speech" apis) || (builtins.elem "*" apis))) [ CoreAudio AudioToolbox ]; + # propagation is needed for Security.framework to be available when linking + propagatedBuildInputs = [ aws-c-cal aws-c-io ]; + cmakeFlags = [ "-DBUILD_DEPS=OFF" "-DCMAKE_SKIP_BUILD_RPATH=OFF" |