summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavol Rusnak <pavol@rusnak.io>2021-08-27 23:30:51 +0200
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2021-08-31 05:40:16 +0000
commit16f96499e464c9e87f9cc9dc8ec69749cd36718e (patch)
tree42d0dfb7b36552af0938f20b74ef8690530ee557
parentMerge pull request #136210 from maxeaubrey/21.05_consul_1.9.9 (diff)
downloadnixpkgs-origin/backport-135962-to-release-21.05.tar.gz
bear: unbreak on aarch64-darwinorigin/backport-135962-to-release-21.05
we have recent macOS SDK on aarch64-darwin, only x86_64-darwin is broken (cherry picked from commit 999f55ee01390f5d455662e48067de68ab6260bb)
-rw-r--r--pkgs/development/tools/build-managers/bear/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix
index e7b0c1d105b4..1b4fb7ec0dfa 100644
--- a/pkgs/development/tools/build-managers/bear/default.nix
+++ b/pkgs/development/tools/build-managers/bear/default.nix
@@ -61,6 +61,6 @@ stdenv.mkDerivation rec {
platforms = platforms.unix;
maintainers = [ maintainers.babariviere ];
# ld: symbol(s) not found for architecture x86_64
- broken = stdenv.isDarwin;
+ broken = stdenv.isDarwin && stdenv.isx86_64;
};
}