diff options
| author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2021-01-12 01:42:13 +0100 |
|---|---|---|
| committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-01-16 10:56:42 -0800 |
| commit | 490a4b6ded492fafc2acb842aafb6e4aa2d6cae8 (patch) | |
| tree | 382ba0966a31c4637fe30a97ce70d1c50cf763a6 /pkgs | |
| parent | ea6ae87eed766036977d5b38115fe4061d433f66 (diff) | |
botan: fix compilation on darwin
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/botan/generic.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix index f7d94f424695f..173f074ead712 100644 --- a/pkgs/development/libraries/botan/generic.nix +++ b/pkgs/development/libraries/botan/generic.nix @@ -4,7 +4,8 @@ , sourceExtension ? "tar.xz" , extraConfigureFlags ? "" , postPatch ? null -, darwin +, CoreServices +, Security , ... }: @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { inherit postPatch; buildInputs = [ python bzip2 zlib gmp openssl boost ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; configurePhase = '' python configure.py --prefix=$out --with-bzip2 --with-zlib ${if openssl != null then "--with-openssl" else ""} ${extraConfigureFlags}${if stdenv.cc.isClang then " --cc=clang" else "" } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 355df6b465fb4..0077960e622f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13002,8 +13002,14 @@ in boost_process = callPackage ../development/libraries/boost-process { }; - botan = callPackage ../development/libraries/botan { openssl = openssl_1_0_2; }; - botan2 = callPackage ../development/libraries/botan/2.0.nix { }; + botan = callPackage ../development/libraries/botan { + openssl = openssl_1_0_2; + inherit (darwin.apple_sdk.frameworks) CoreServices Security; + }; + + botan2 = callPackage ../development/libraries/botan/2.0.nix { + inherit (darwin.apple_sdk.frameworks) CoreServices Security; + }; box2d = callPackage ../development/libraries/box2d { }; |