pyrox.dev / nixpkgs
lol
fork atom

botan3: remove code for macOS < 11 (#371328)

authored by

7c6f434c and committed by
GitHub fea2ee4a 4272a1f6

-50
-48
pkgs/development/libraries/botan/botan3-macos.patch
··· 1 - diff --git a/src/lib/prov/commoncrypto/commoncrypto_block.cpp b/src/lib/prov/commoncrypto/commoncrypto_block.cpp 2 - index a07fe118d..f059ee497 100644 3 - --- a/src/lib/prov/commoncrypto/commoncrypto_block.cpp 4 - +++ b/src/lib/prov/commoncrypto/commoncrypto_block.cpp 5 - @@ -11,6 +11,7 @@ 6 - #include <botan/hex.h> 7 - #include <botan/internal/commoncrypto_utils.h> 8 - 9 - +#include <CommonCrypto/CommonCryptoError.h> 10 - #include <CommonCrypto/CommonCrypto.h> 11 - 12 - namespace Botan { 13 - diff --git a/src/lib/prov/commoncrypto/commoncrypto_hash.cpp b/src/lib/prov/commoncrypto/commoncrypto_hash.cpp 14 - index 1fb79c419..faf9575c2 100644 15 - --- a/src/lib/prov/commoncrypto/commoncrypto_hash.cpp 16 - +++ b/src/lib/prov/commoncrypto/commoncrypto_hash.cpp 17 - @@ -11,6 +11,7 @@ 18 - #include <botan/internal/stl_util.h> 19 - #include <unordered_map> 20 - 21 - +#include <CommonCrypto/CommonCryptoError.h> 22 - #include <CommonCrypto/CommonCrypto.h> 23 - 24 - namespace Botan { 25 - diff --git a/src/lib/prov/commoncrypto/commoncrypto_utils.h b/src/lib/prov/commoncrypto/commoncrypto_utils.h 26 - index b1c7411fd..9becab2d1 100644 27 - --- a/src/lib/prov/commoncrypto/commoncrypto_utils.h 28 - +++ b/src/lib/prov/commoncrypto/commoncrypto_utils.h 29 - @@ -10,6 +10,7 @@ 30 - 31 - #include <botan/sym_algo.h> 32 - 33 - +#include <CommonCrypto/CommonCryptoError.h> 34 - #include <CommonCrypto/CommonCrypto.h> 35 - 36 - namespace Botan { 37 - diff --git a/src/lib/rng/system_rng/system_rng.cpp b/src/lib/rng/system_rng/system_rng.cpp 38 - index b2f7b4c45..f4933b1e3 100644 39 - --- a/src/lib/rng/system_rng/system_rng.cpp 40 - +++ b/src/lib/rng/system_rng/system_rng.cpp 41 - @@ -20,6 +20,7 @@ 42 - #include <bcrypt.h> 43 - #include <windows.h> 44 - #elif defined(BOTAN_TARGET_OS_HAS_CCRANDOM) 45 - + #include <CommonCrypto/CommonCryptoError.h> 46 - #include <CommonCrypto/CommonRandom.h> 47 - #elif defined(BOTAN_TARGET_OS_HAS_ARC4RANDOM) 48 - #include <stdlib.h>
-2
pkgs/development/libraries/botan/default.nix
··· 124 124 botan3 = common { 125 125 version = "3.6.1"; 126 126 hash = "sha256-fLhXXYjSMsdxdHadf54ku0REQWBYWYbuvWbnScuakIk="; 127 - # this patch fixes build errors on MacOS with SDK 10.12, recheck to remove this again 128 - patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./botan3-macos.patch ]; 129 127 }; 130 128 131 129 botan2 = common {