git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #108574 from marsam/fix-aws-c-cal-darwin

nix: fix build on darwin

commit44c443a7a602e7752641aac21e4ad17061761290 authorMario Rodas <marsam@users.noreply.github.com> dateWed 6 Jan 2021, 10:01 (6 years ago) parentbd286e605e800d
3 files changed+7−3
pkgs/development/libraries/aws-c-cal/default.nix+2−2 pkgs/development/libraries/aws-c-io/default.nix+2 pkgs/top-level/all-packages.nix+3−1
pkgs/development/libraries/aws-c-cal/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, cmake, aws-c-common, openssl }:
1+{ lib, stdenv, fetchFromGitHub, cmake, aws-c-common, openssl, Security }:
22
33stdenv.mkDerivation rec {
44 pname = "aws-c-cal";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 nativeBuildInputs = [ cmake ];
1515
16− buildInputs = [ aws-c-common openssl ];
16+ buildInputs = [ aws-c-common openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
1717
1818 cmakeFlags = [
1919 "-DBUILD_SHARED_LIBS=ON"
pkgs/development/libraries/aws-c-io/default.nix+2
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
2020 "-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake"
2121 ];
2222
23+ NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error";
24+
2325 meta = with lib; {
2426 description = "AWS SDK for C module for IO and TLS";
2527 homepage = "https://github.com/awslabs/aws-c-io";
pkgs/top-level/all-packages.nix+3−1
@@ -12586,7 +12586,9 @@ in
1258612586 inherit (darwin.apple_sdk.frameworks) AudioUnit CoreServices;
1258712587 };
1258812588
12589− aws-c-cal = callPackage ../development/libraries/aws-c-cal { };
12589+ aws-c-cal = callPackage ../development/libraries/aws-c-cal {
12590+ inherit (darwin.apple_sdk.frameworks) Security;
12591+ };
1259012592
1259112593 aws-c-common = callPackage ../development/libraries/aws-c-common { };
1259212594