public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

botan: fix compilation on darwin

This commit is contained in:
Sandro Jäckel 2021-01-12 01:42:13 +01:00 committed by Jonathan Ringer
parent ea6ae87eed
commit 490a4b6ded
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/botan/generic.nix
View File

@ -4,7 +4,8 @@
, sourceExtension ? "tar.xz" , sourceExtension ? "tar.xz"
, extraConfigureFlags ? "" , extraConfigureFlags ? ""
, postPatch ? null , postPatch ? null
, darwin , CoreServices
, Security
, ... , ...
}: }:
@ -23,7 +24,7 @@ stdenv.mkDerivation rec {
inherit postPatch; inherit postPatch;
buildInputs = [ python bzip2 zlib gmp openssl boost ] 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 = '' 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 "" } 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 "" }

10
pkgs/top-level/all-packages.nix
View File

@ -13002,8 +13002,14 @@ in
boost_process = callPackage ../development/libraries/boost-process { }; boost_process = callPackage ../development/libraries/boost-process { };
botan = callPackage ../development/libraries/botan { openssl = openssl_1_0_2; }; botan = callPackage ../development/libraries/botan {
botan2 = callPackage ../development/libraries/botan/2.0.nix { }; 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 { }; box2d = callPackage ../development/libraries/box2d { };