bear: fix #279035
bear: fix #279035
Conversation
The previous build system patch was incomplete and left the `wrapper.d` directory empty, leaving Bear unable to pick up any build commands at all and breaking the functional test suite, which we also weren't running. Switch to overriding CMake flags instead and add the patches and dependencies necessary to get the functional tests running to prevent a future regression. I've checked that the instructions in Nix's `doc/manual/src/contributing/hacking.md` work after this change, which is what started this yak shave in the first place.
|
I no longer have a setup to use Bear in any meaningful way but the diff LGTM and it runs successfully on aarch64-darwin. |
|
I think some of the tests are broken. Maybe we could disable the tests for now and fix them later. This would let us get a working bear merged. WDYT? |
Fine for me. |
|
Are you still going to do that in this PR or in a follow-up? |
|
I believe I've disabled the tests by added |
|
Hmm that doesn't seem to have worked. Does anyone know how to disable those tests? If not, I'll revert the docheck change and let's merge it? |
|
It looks like those cmake flags helped, except on x86_64-darwin. Not sure how to fix that. In any case, this is probably fine to merge. |
|
Result of 1 package built:
|
|
Successfully created backport PR for |
Description of changes
A continuation of #238531. Fixes bear such that that it runs on aarch64-darwin.
Things done
I cherry picked the commits from #238531, then added another commit to remove the broken marker for bear on darwin. I can squash the commits together if that's better.
I tested on aarch64-darwin by running bear when building
nix.compile_commands.jsonwas generated and was non-empty.nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.