Update botan and fix the build

1 files changed, 7 insertions, 2 deletions

diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix
index b4bd4e05841..791731ec856 100644
--- a/pkgs/development/libraries/botan/generic.nix
+++ b/pkgs/development/libraries/botan/generic.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   version = "${baseVersion}.${revision}";
 
   src = fetchurl {
-    name = "Botan-${version}.tar.bz2";
+    name = "Botan-${version}.tgz";
     url = "http://files.randombit.net/botan/v${baseVersion}/Botan-${version}.tbz";
     inherit sha256;
   };
@@ -17,17 +17,22 @@ stdenv.mkDerivation rec {
   buildInputs = [ python bzip2 zlib gmp openssl boost ];
 
   configurePhase = ''
-    python configure.py --prefix=$out --with-gnump --with-bzip2 --with-zlib --with-openssl --cc=$CC
+    python configure.py --prefix=$out --with-gnump --with-bzip2 --with-zlib ${if openssl != null then "--with-openssl" else ""}
   '';
 
   enableParallelBuilding = true;
 
+  preInstall = ''
+    patchShebangs src/scripts
+  '';
+
   postInstall = ''
     cd "$out"/lib/pkgconfig
     ln -s botan-*.pc botan.pc || true
   '';
 
   meta = with stdenv.lib; {
+    inherit version;
     description = "Cryptographic algorithms library";
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.unix;