Commit dc7750f6 authored by Markus Theil's avatar Markus Theil
Browse files

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: default avatarMarkus Theil <theil.markus@gmail.com>
parent 45497da7

pkgs/development/libraries/botan/3.0.nix

+3 −1
Original line number Diff line number Diff line 
{ 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;

})

pkgs/development/libraries/botan/generic.nix

+4 −2
Original line number Diff line number Diff line
@@ -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/";

pkgs/top-level/all-packages.nix

+2 −3
Original line number Diff line number Diff line
@@ -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 { };