Merge master into staging-next

2021-02-21 12:19:43 +00:00
parent 2c8fa86436 e3d3643f1b
commit cf22d5fee7
24 changed files with 213 additions and 120 deletions
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
  strictDeps = true;

  configureFlags = [ "--with-libgpg-error-prefix=${libgpgerror.dev}" ]
-   ++ lib.optional stdenv.hostPlatform.isMusl "--disable-asm";
+      ++ lib.optional (stdenv.hostPlatform.isMusl || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) "--disable-asm"; # for darwin see https://dev.gnupg.org/T5157

  # Necessary to generate correct assembly when compiling for aarch32 on
  # aarch64