From 4cf06c9f8c43a211adc4c6d1b790eae319cb698a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 6 Jan 2021 08:20:00 +0000 Subject: [PATCH 1/2] aws-c-cal: fix build on darwin --- pkgs/development/libraries/aws-c-cal/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/aws-c-cal/default.nix b/pkgs/development/libraries/aws-c-cal/default.nix index 5a39e39390db..057aad447d5e 100644 --- a/pkgs/development/libraries/aws-c-cal/default.nix +++ b/pkgs/development/libraries/aws-c-cal/default.nix @@ -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" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be0c6266c4b9..2c42e84317f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12578,7 +12578,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 { }; From 05e800dfee1aa5fb218920a84a7fbda59ae79083 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 6 Jan 2021 08:20:00 +0000 Subject: [PATCH 2/2] aws-c-io: fix build on darwin --- pkgs/development/libraries/aws-c-io/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix index c93b2748a3e2..eda87ba2c534 100644 --- a/pkgs/development/libraries/aws-c-io/default.nix +++ b/pkgs/development/libraries/aws-c-io/default.nix @@ -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";