Merge pull request #108574 from marsam/fix-aws-c-cal-darwin

nix: fix build on darwin
This commit is contained in:
Mario Rodas 2021-01-06 10:01:21 -05:00 committed by GitHub
commit 44c443a7a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, aws-c-common, openssl }:
{ lib, stdenv, fetchFromGitHub, cmake, aws-c-common, openssl, Security }:
stdenv.mkDerivation rec {
pname = "aws-c-cal";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ aws-c-common openssl ];
buildInputs = [ aws-c-common openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"

View File

@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
"-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";

View File

@ -12586,7 +12586,9 @@ in
inherit (darwin.apple_sdk.frameworks) AudioUnit CoreServices;
};
aws-c-cal = callPackage ../development/libraries/aws-c-cal { };
aws-c-cal = callPackage ../development/libraries/aws-c-cal {
inherit (darwin.apple_sdk.frameworks) Security;
};
aws-c-common = callPackage ../development/libraries/aws-c-common { };