cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #135989 from veprbl/pr/bear_darwin_fix

Browse source 
bear: fix on x86_64-darwin
This commit is contained in:
Domen Kožar 2021-08-28 09:07:34 +02:00 committed by GitHub
commit 8b34c96c58
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/tools/build-managers/bear/default.nix
View file

@ -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;
};
}

8
pkgs/top-level/all-packages.nix
View file

@ -13345,7 +13345,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 { };