Skip to content

Commit

Permalink
Link with cxxabi explicitly on darwin
Browse files Browse the repository at this point in the history
Upstream bug: NixOS/nixpkgs#130963
  • Loading branch information
tobim committed Nov 15, 2021
1 parent b5b84d5 commit f3a1521
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions nix/overlay.nix
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ in {
# at the optimization stage.
# TODO: Remove when updating to CAF 0.18.
+ lib.optionalString isStatic " -std=c++17";
# https://github.com/NixOS/nixpkgs/issues/130963
NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lc++abi";
preCheck = ''
export LD_LIBRARY_PATH=$PWD/lib
export DYLD_LIBRARY_PATH=$PWD/lib
Expand Down Expand Up @@ -69,9 +71,15 @@ in {
"-DSPDLOG_BUILD_SHARED=OFF"
];
});
zeek-broker = final.callPackage ./zeek-broker {inherit stdenv;};
zeek-broker = (final.callPackage ./zeek-broker {inherit stdenv;}).overrideAttrs (old: {
# https://github.com/NixOS/nixpkgs/issues/130963
NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lc++abi";
});
vast-source = final.nix-gitignore.gitignoreSource [] ./..;
vast = final.callPackage ./vast {inherit stdenv;};
vast = (final.callPackage ./vast {inherit stdenv;}).overrideAttrs (old: {
# https://github.com/NixOS/nixpkgs/issues/130963
NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lc++abi";
});
vast-ci = final.vast.override {
buildType = "CI";
arrow-cpp = final.arrow-cpp-no-simd;
Expand Down

0 comments on commit f3a1521

Please sign in to comment.