mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-29 00:20:19 +02:00
bear: fix on x86_64-darwin
This commit is contained in:
parent
c0c88243ee
commit
e2e44d9b5c
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -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 { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue