cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #116099 from matthewbauer/fix-aws-sdk-cpp-on-big-sur-2

Browse source 
aws-sdk-cpp: propagate Security framework
This commit is contained in:
Matthew Bauer 2021-05-04 22:31:30 -05:00 committed by GitHub
commit 8b51a45a55
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/aws-c-cal/default.nix
View file

@ -13,7 +13,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ]; 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 = [ cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON" "-DBUILD_SHARED_LIBS=ON"

5
pkgs/development/libraries/aws-c-io/default.nix
View file

@ -13,15 +13,14 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ]; 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 = [ cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON" "-DBUILD_SHARED_LIBS=ON"
"-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake" "-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake"
]; ];
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error";
meta = with lib; { meta = with lib; {
description = "AWS SDK for C module for IO and TLS"; description = "AWS SDK for C module for IO and TLS";
homepage = "https://github.com/awslabs/aws-c-io"; homepage = "https://github.com/awslabs/aws-c-io";

5
pkgs/development/libraries/aws-sdk-cpp/default.nix
View file

@ -26,12 +26,15 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
curl openssl s2n-tls zlib 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 && ] ++ lib.optionals (stdenv.isDarwin &&
((builtins.elem "text-to-speech" apis) || ((builtins.elem "text-to-speech" apis) ||
(builtins.elem "*" apis))) (builtins.elem "*" apis)))
[ CoreAudio AudioToolbox ]; [ CoreAudio AudioToolbox ];
# propagation is needed for Security.framework to be available when linking
propagatedBuildInputs = [ aws-c-cal aws-c-io ];
cmakeFlags = [ cmakeFlags = [
"-DBUILD_DEPS=OFF" "-DBUILD_DEPS=OFF"
"-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DCMAKE_SKIP_BUILD_RPATH=OFF"