diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/botan')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/botan/2.0.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/botan/generic.nix | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/libraries/botan/2.0.nix b/nixpkgs/pkgs/development/libraries/botan/2.0.nix index 6987b6c35f0a..52f29287f8ea 100644 --- a/nixpkgs/pkgs/development/libraries/botan/2.0.nix +++ b/nixpkgs/pkgs/development/libraries/botan/2.0.nix @@ -2,8 +2,8 @@ callPackage ./generic.nix (args // { baseVersion = "2.19"; - revision = "2"; - sha256 = "sha256-OvXxdhXGtc2Lgy0mn7bLTVTsZPnrCd2/Gt1Qk5QbTXU="; + revision = "3"; + sha256 = "sha256-2uBH85nFpH8IfbXT2dno8RrkmF0UySjXHaGv+AGALVU="; postPatch = '' sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt ''; diff --git a/nixpkgs/pkgs/development/libraries/botan/generic.nix b/nixpkgs/pkgs/development/libraries/botan/generic.nix index 3e5884c6c99a..1c5126584c2c 100644 --- a/nixpkgs/pkgs/development/libraries/botan/generic.nix +++ b/nixpkgs/pkgs/development/libraries/botan/generic.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; configurePhase = '' - python configure.py --prefix=$out --with-bzip2 --with-zlib ${extraConfigureFlags}${if stdenv.cc.isClang then " --cc=clang" else "" } + python configure.py --prefix=$out --with-bzip2 --with-zlib ${extraConfigureFlags}${lib.optionalString stdenv.cc.isClang " --cc=clang"} ''; enableParallelBuilding = true; @@ -46,6 +46,8 @@ stdenv.mkDerivation rec { ln -s botan-*.pc botan.pc || true ''; + doCheck = true; + meta = with lib; { description = "Cryptographic algorithms library"; maintainers = with maintainers; [ raskin ]; |