diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 62f0d20569b9..bb2a7ab8a64b 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -49,6 +49,9 @@ stdenv.mkDerivation rec { ./no-double-relative.patch ]; + # 'path' is unavailable: introduced in macOS 10.15 + CXXFLAGS = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") "-D_LIBCPP_DISABLE_AVAILABILITY"; + meta = with lib; { description = "Tool that generates a compilation database for clang tooling"; longDescription = '' @@ -60,7 +63,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = with maintainers; [ babariviere qyliss ]; - # ld: symbol(s) not found for architecture x86_64 - broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4330bda4c683..a108649194d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13343,7 +13343,13 @@ with pkgs; buildBazelPackage = callPackage ../build-support/build-bazel-package { }; - bear = callPackage ../development/tools/build-managers/bear { }; + bear = callPackage ../development/tools/build-managers/bear { + # error: no viable constructor or deduction guide for deduction of template arguments of 'map' + stdenv = if stdenv.hostPlatform.system == "x86_64-darwin" then + llvmPackages_11.stdenv + else + stdenv; + }; bin_replace_string = callPackage ../development/tools/misc/bin_replace_string { };