diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix index 1c5126584c2c..8c9c1a88a8b6 100644 --- a/pkgs/development/libraries/botan/generic.nix +++ b/pkgs/development/libraries/botan/generic.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { pname = "botan"; version = "${baseVersion}.${revision}"; + outputs = [ "out" "dev" ]; + src = fetchurl { name = "Botan-${version}.${sourceExtension}"; urls = [ @@ -30,7 +32,9 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; configurePhase = '' + runHook preConfigure python configure.py --prefix=$out --with-bzip2 --with-zlib ${extraConfigureFlags}${lib.optionalString stdenv.cc.isClang " --cc=clang"} + runHook postConfigure ''; enableParallelBuilding = true; diff --git a/pkgs/tools/security/softhsm/default.nix b/pkgs/tools/security/softhsm/default.nix index b218a3241f9f..648a4bc6515b 100644 --- a/pkgs/tools/security/softhsm/default.nix +++ b/pkgs/tools/security/softhsm/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-crypto-backend=botan" - "--with-botan=${botan2}" + "--with-botan=${lib.getDev botan2}" "--sysconfdir=$out/etc" "--localstatedir=$out/var" ];