summary refs log tree commit diff
diff options
context:
space:
mode:
author7c6f434c <7c6f434c@mail.ru>2023-08-01 07:46:39 +0000
committerGitHub <noreply@github.com>2023-08-01 07:46:39 +0000
commit356c6dcdf37cfb4162f534e5dcabadddbfbd6bfa (patch)
treeba4dfc0f2095a73ae6e2164d8858eb360fdb11e4
parent714bd4a3e3cc6d97dea0c658942204ef4d66fce5 (diff)
parentbb2fd1be106ae26671b4a5533199401ba3b9cbd0 (diff)
downloadnixpkgs-356c6dcdf37cfb4162f534e5dcabadddbfbd6bfa.tar
nixpkgs-356c6dcdf37cfb4162f534e5dcabadddbfbd6bfa.tar.gz
nixpkgs-356c6dcdf37cfb4162f534e5dcabadddbfbd6bfa.tar.bz2
nixpkgs-356c6dcdf37cfb4162f534e5dcabadddbfbd6bfa.tar.lz
nixpkgs-356c6dcdf37cfb4162f534e5dcabadddbfbd6bfa.tar.xz
nixpkgs-356c6dcdf37cfb4162f534e5dcabadddbfbd6bfa.tar.zst
nixpkgs-356c6dcdf37cfb4162f534e5dcabadddbfbd6bfa.zip
Merge pull request #246375 from thillux/botan-cross-aarch64
botan: fix cross compilation on aarch64
-rw-r--r--pkgs/development/libraries/botan/generic.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix
index 567f570f71d..795cd5189ef 100644
--- a/pkgs/development/libraries/botan/generic.nix
+++ b/pkgs/development/libraries/botan/generic.nix
@@ -29,12 +29,13 @@ stdenv.mkDerivation rec {
   patches = extraPatches;
   inherit postPatch;
 
-  buildInputs = [ python3 bzip2 zlib gmp boost ]
+  nativeBuildInputs = [ python3 ];
+  buildInputs = [ bzip2 zlib gmp boost ]
     ++ 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"}
+    python configure.py --prefix=$out --with-bzip2 --with-zlib ${extraConfigureFlags}${lib.optionalString stdenv.cc.isClang " --cc=clang"} ${lib.optionalString stdenv.hostPlatform.isAarch64 " --cpu=aarch64"}
     runHook postConfigure
   '';