aboutsummaryrefslogtreecommitdiff
path: root/pkgs/development/libraries/botan
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2015-03-08 21:55:17 +0300
committerMichael Raskin <7c6f434c@mail.ru>2015-03-09 01:03:01 +0300
commit1fdc855b2f9143162b94f69865e258d14917925c (patch)
tree0646bdecce41311e36fc605dfbd57cd7cba50c7e /pkgs/development/libraries/botan
parent3d4f7be9a3a4d477f7276c5fef7a1de03bf2c8fb (diff)
Update botan unstable
Diffstat (limited to 'pkgs/development/libraries/botan')
-rw-r--r--pkgs/development/libraries/botan/default.nix1
-rw-r--r--pkgs/development/libraries/botan/generic.nix3
-rw-r--r--pkgs/development/libraries/botan/unstable.nix4
3 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix
index 57df3e7c9153..3006a5a456d2 100644
--- a/pkgs/development/libraries/botan/default.nix
+++ b/pkgs/development/libraries/botan/default.nix
@@ -4,4 +4,5 @@ callPackage ./generic.nix (args // {
baseVersion = "1.10";
revision = "9";
sha256 = "1wldp9py3qcdgswgxya83c03y6345a6cf3vwz0y41bl1l39jfza8";
+ extraConfigureFlags = "--with-gnump";
})
diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix
index 8d68009390d7..b01ea401b38a 100644
--- a/pkgs/development/libraries/botan/generic.nix
+++ b/pkgs/development/libraries/botan/generic.nix
@@ -1,6 +1,7 @@
{ stdenv, fetchurl, python, bzip2, zlib, gmp, openssl, boost
# Passed by version specific builders
, baseVersion, revision, sha256
+, extraConfigureFlags ? ""
, ...
}:
@@ -17,7 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = [ python bzip2 zlib gmp openssl boost ];
configurePhase = ''
- python configure.py --prefix=$out --with-gnump --with-bzip2 --with-zlib ${if openssl != null then "--with-openssl" else ""}
+ python configure.py --prefix=$out --with-bzip2 --with-zlib ${if openssl != null then "--with-openssl" else ""} ${extraConfigureFlags}
'';
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/botan/unstable.nix b/pkgs/development/libraries/botan/unstable.nix
index f979fb8a9591..87a3e49b89b4 100644
--- a/pkgs/development/libraries/botan/unstable.nix
+++ b/pkgs/development/libraries/botan/unstable.nix
@@ -2,7 +2,7 @@
callPackage ./generic.nix (args // {
baseVersion = "1.11";
- revision = "10";
- sha256 = "06d5p0bs953r2pqfc635x2w78m3xv28gr6fmvd8whbk9qp8r91yb";
+ revision = "14";
+ sha256 = "1laa6d8w9v39a2pfmilj62jwc67r0jbq5f3xdlffd3kvkdnwcysb";
openssl = null;
})