Commit 550c926a authored by nikstur's avatar nikstur
Browse files

botan: use libcxx when building statically 

botan only works whne building statically with libcxx. Otherwise it
fails at the linking stage. This re-enables the CLI and tests even in
the static case and makes it actually work when you try to use it.
parent 63fa397d

pkgs/development/libraries/botan/default.nix

+4 −6
Original line number Diff line number Diff line
@@ -75,12 +75,10 @@ let 
        ];



      buildTargets =

        lib.optionals finalAttrs.finalPackage.doCheck [ "tests" ]

        [ "cli" ]

        ++ lib.optionals finalAttrs.finalPackage.doCheck [ "tests" ]

        ++ lib.optionals static [ "static" ]

        ++ lib.optionals (!static) [

          "cli"

          "shared"

        ];

        ++ lib.optionals (!static) [ "shared" ];



      botanConfigureFlags =

        [
@@ -133,7 +131,7 @@ let 
        ln -s botan-*.pc botan.pc || true

      '';



      doCheck = !static;

      doCheck = true;



      meta = with lib; {

        description = "Cryptographic algorithms library";

pkgs/top-level/all-packages.nix

+5 −1
Original line number Diff line number Diff line
@@ -7847,7 +7847,11 @@ with pkgs; 














  boost = boost187;



























  inherit (callPackages ../development/libraries/botan { })













  inherit













    (callPackages ../development/libraries/botan {













      # botan3 only sensibly works with libcxxStdenv when building static binaries













      stdenv = if stdenv.hostPlatform.isStatic then buildPackages.libcxxStdenv else stdenv;













    })















    botan2















    botan3















    ;