From 6255468c4e648f48ea49efc9ba598bce5ec768b8 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 12 Mar 2021 14:45:38 -0600 Subject: [PATCH] aws-sdk-cpp: propagate Security framework We need to propagate the Security framework to avoid getting ld: file not found: /System/Library/Frameworks/Security.framework/Versions/A/Security for architecture x86_64 on linking aws-sdk-cpp libraries. --- pkgs/development/libraries/aws-c-cal/default.nix | 4 +++- pkgs/development/libraries/aws-c-io/default.nix | 5 ++--- 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 d6fbb97014d..d4e7ab82d45 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"