Unverified Commit 47569122 authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #242404 from Artturin/splitoutputs

parents 1ffc00aa 7d114338

pkgs/development/libraries/botan/generic.nix

+4 −0
Original line number Diff line number Diff line
@@ -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;

pkgs/tools/security/softhsm/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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"

    ];