From 170e33364456a79bbcb460ca7ee0d54c790be010 Mon Sep 17 00:00:00 2001 From: nikstur Date: Tue, 3 Sep 2024 15:50:19 +0200 Subject: [PATCH] botan: refactor configureFlags into botanConfigureFlags --- pkgs/development/libraries/botan/generic.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix index 47fe74547ebf..5b3b4f04b0f3 100644 --- a/pkgs/development/libraries/botan/generic.nix +++ b/pkgs/development/libraries/botan/generic.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation (finalAttrs: { pname = "botan"; version = "${baseVersion}.${revision}"; + __structuredAttrs = true; + outputs = [ "out" "dev" ]; src = fetchurl { @@ -33,9 +35,19 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ bzip2 zlib gmp boost ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; + botanConfigureFlags = [ + "--prefix=${placeholder "out"}" + "--with-bzip2" + "--with-zlib" + ] ++ lib.optionals stdenv.cc.isClang [ + "--cc=clang" + ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ + "--cpu=aarch64" + ]; + configurePhase = '' runHook preConfigure - python configure.py --prefix=$out --with-bzip2 --with-zlib ${extraConfigureFlags}${lib.optionalString stdenv.cc.isClang " --cc=clang"} ${lib.optionalString stdenv.hostPlatform.isAarch64 " --cpu=aarch64"} + python configure.py ''${botanConfigureFlags[@]} ${extraConfigureFlags} runHook postConfigure '';