botan: fix compilation on darwin

wip/yesman
Sandro Jäckel 4 years ago committed by Jonathan Ringer
parent ea6ae87eed
commit 490a4b6ded
  1. 5
      pkgs/development/libraries/botan/generic.nix
  2. 10
      pkgs/top-level/all-packages.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 "" }

@ -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 { };

Loading…
Cancel
Save