diff options
author | Markus Theil <theil.markus@gmail.com> | 2023-07-19 13:10:59 +0200 |
---|---|---|
committer | Markus Theil <theil.markus@gmail.com> | 2023-07-19 15:36:12 +0200 |
commit | dc7750f637911166f6ca5f03b5ee461c3b11499c (patch) | |
tree | ccc5ad09f26417ddb8a3d8ee889082debea75c95 | |
parent | 45497da716dd3fd431dea6f29ad4cc3fbd064707 (diff) | |
download | nixpkgs-dc7750f637911166f6ca5f03b5ee461c3b11499c.tar nixpkgs-dc7750f637911166f6ca5f03b5ee461c3b11499c.tar.gz nixpkgs-dc7750f637911166f6ca5f03b5ee461c3b11499c.tar.bz2 nixpkgs-dc7750f637911166f6ca5f03b5ee461c3b11499c.tar.lz nixpkgs-dc7750f637911166f6ca5f03b5ee461c3b11499c.tar.xz nixpkgs-dc7750f637911166f6ca5f03b5ee461c3b11499c.tar.zst nixpkgs-dc7750f637911166f6ca5f03b5ee461c3b11499c.zip |
botan3: flag macos as bad platform for now
Default clang 11 on MacOS is too old for botan 3, which requires at least clang 14. Signed-off-by: Markus Theil <theil.markus@gmail.com>
-rw-r--r-- | pkgs/development/libraries/botan/3.0.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/botan/generic.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/development/libraries/botan/3.0.nix b/pkgs/development/libraries/botan/3.0.nix index bd996d002d8..139c002bb3b 100644 --- a/pkgs/development/libraries/botan/3.0.nix +++ b/pkgs/development/libraries/botan/3.0.nix @@ -1,7 +1,9 @@ -{ callPackage, fetchpatch, ... } @ args: +{ callPackage, fetchpatch, lib, ... } @ args: callPackage ./generic.nix (args // { baseVersion = "3.1"; revision = "1"; sha256 = "sha256-MMhP6RmTapj+9TMfJGxiqiwOTSCFstRREgf2ogr6Oms="; + # reconsider removing this platform marking, when MacOS uses Clang 14.0+ by default. + badPlatforms = lib.platforms.darwin; }) diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix index 8c9c1a88a8b..239f94c2052 100644 --- a/pkgs/development/libraries/botan/generic.nix +++ b/pkgs/development/libraries/botan/generic.nix @@ -4,10 +4,11 @@ , sourceExtension ? "tar.xz" , extraConfigureFlags ? "" , extraPatches ? [ ] +, badPlatforms ? [ ] , postPatch ? null , knownVulnerabilities ? [ ] -, CoreServices -, Security +, CoreServices ? null +, Security ? null , ... }: @@ -57,6 +58,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin ]; platforms = platforms.unix; license = licenses.bsd2; + inherit badPlatforms; inherit knownVulnerabilities; }; passthru.updateInfo.downloadPage = "http://files.randombit.net/botan/"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85601972fe8..a70f33a9bb2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20292,9 +20292,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; - botan3 = callPackage ../development/libraries/botan/3.0.nix { - inherit (darwin.apple_sdk.frameworks) CoreServices Security; - }; + # may add CoreServices and Security again, when MacOS uses Clang 14.0+ by default. + botan3 = callPackage ../development/libraries/botan/3.0.nix { }; box2d = callPackage ../development/libraries/box2d { }; |