Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[staging-next] cmake: fix build on darwin #110647

Merged
merged 1 commit into from Jan 24, 2021

Conversation

r-burns
Copy link
Contributor

@r-burns r-burns commented Jan 24, 2021

Fixes missing CoreFoundation declarations since bump to 3.19.3,
e.g. error: unknown type name 'CFUUIDRef'

ApplicationServices.h transitively includes CoreFoundation.h, but as we
patch ApplicationServices out of CMake, the CF symbols were not visible.
Previously this was not a concern, as they were not needed until
Kitware/CMake@d250b67

Motivation for this change

#110569 (cc @FRidh)

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Fixes missing CoreFoundation declarations since bump to 3.19.3,
e.g. `error: unknown type name 'CFUUIDRef'`

ApplicationServices.h transitively includes CoreFoundation.h, but as we
patch ApplicationServices out of CMake, the CF symbols were not visible.
Previously this was not a concern, as they were not needed until
Kitware/CMake@d250b67
@jonringer
Copy link
Contributor

cc @SuperSandro2000 are you able to test this?

@r-burns
Copy link
Contributor Author

r-burns commented Jan 24, 2021

Fwiw, I was able to build cmake-boot, and proceed until findutils failed due to #109058. After reverting that commit, I am able to build darwin stdenv.

@FRidh FRidh mentioned this pull request Jan 24, 2021
10 tasks
@FRidh FRidh merged commit a761d5e into NixOS:staging-next Jan 24, 2021
FRidh added a commit that referenced this pull request Jan 24, 2021
Broke darwin stdenv
#110647 (comment)

This reverts commit 6700066.
@r-burns r-burns deleted the cmake-darwin-cf branch January 24, 2021 23:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants