diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-02-21 12:19:43 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-21 12:19:43 +0000 |
| commit | cf22d5fee78d8fa5e6fef32acb17d3df3d3c5b28 (patch) | |
| tree | 351e4fc7046d7a4f7f6c6fc03a1a6ae7553d7b2f /pkgs/development/libraries/libgcrypt | |
| parent | 2c8fa86436607c8bb12a1ca748a8fe99815aa6c2 (diff) | |
| parent | e3d3643f1b26db3bb9892d7b6e433889ce8c5e60 (diff) | |
| download | nixpkgs-cf22d5fee78d8fa5e6fef32acb17d3df3d3c5b28.tar nixpkgs-cf22d5fee78d8fa5e6fef32acb17d3df3d3c5b28.tar.gz nixpkgs-cf22d5fee78d8fa5e6fef32acb17d3df3d3c5b28.tar.bz2 nixpkgs-cf22d5fee78d8fa5e6fef32acb17d3df3d3c5b28.tar.lz nixpkgs-cf22d5fee78d8fa5e6fef32acb17d3df3d3c5b28.tar.xz nixpkgs-cf22d5fee78d8fa5e6fef32acb17d3df3d3c5b28.tar.zst nixpkgs-cf22d5fee78d8fa5e6fef32acb17d3df3d3c5b28.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries/libgcrypt')
| -rw-r--r-- | pkgs/development/libraries/libgcrypt/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index f3db8d8c03b..80cd5bc13cc 100644 --- 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 |