diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2021-01-06 10:01:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-06 10:01:21 -0500 |
| commit | 44c443a7a602e7752641aac21e4ad17061761290 (patch) | |
| tree | 11077e58b1f475a08d511f8286c399acac7b9869 | |
| parent | bd286e6d4827136cc526b645a9b1d3895792aae1 (diff) | |
| parent | 05e800dfee1aa5fb218920a84a7fbda59ae79083 (diff) | |
| download | nixpkgs-44c443a7a602e7752641aac21e4ad17061761290.tar nixpkgs-44c443a7a602e7752641aac21e4ad17061761290.tar.gz nixpkgs-44c443a7a602e7752641aac21e4ad17061761290.tar.bz2 nixpkgs-44c443a7a602e7752641aac21e4ad17061761290.tar.lz nixpkgs-44c443a7a602e7752641aac21e4ad17061761290.tar.xz nixpkgs-44c443a7a602e7752641aac21e4ad17061761290.tar.zst nixpkgs-44c443a7a602e7752641aac21e4ad17061761290.zip | |
Merge pull request #108574 from marsam/fix-aws-c-cal-darwin
nix: fix build on darwin
| -rw-r--r-- | pkgs/development/libraries/aws-c-cal/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/aws-c-io/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/libraries/aws-c-cal/default.nix b/pkgs/development/libraries/aws-c-cal/default.nix index 5a39e39390d..057aad447d5 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/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix index c93b2748a3e..eda87ba2c53 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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index efaff752cc7..1796f04f308 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |