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.

Sign up for GitHub

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

Jump to bottom

[staging-next] cmake: Fix embedded curl on darwin #131969

Closed
wants to merge 2 commits into from
Closed

[staging-next] cmake: Fix embedded curl on darwin #131969

wants to merge 2 commits into from

Conversation

tobim
Copy link
Contributor

@tobim tobim commented Jul 29, 2021

Add SystemConfiguration framework to buildInputs.

This is a naive attempt that I can't test at the moment.

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/)
  • 21.11 Release Notes (or backporting 21.05 Relase notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Jul 29, 2021
@tobim tobim mentioned this pull request Jul 29, 2021
Merged
11 tasks
@tobim tobim force-pushed the pkgs/cmake-3.21-darwin branch 2 times, most recently from c27e7e5 to b48d4e0 Compare July 29, 2021 19:08
@ofborg ofborg bot added the 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild label Jul 29, 2021
@ofborg ofborg bot requested review from LnL7 and ttuegel July 29, 2021 19:41
@ofborg ofborg bot added 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Jul 29, 2021
@FRidh FRidh mentioned this pull request Jul 30, 2021
Merged
11 tasks
@tobim
Copy link
Contributor Author

tobim commented Jul 30, 2021

This change seems to add SystemConfiguration to the bootstrap closure, and that doesn't work either.

This is actually the same problem as in #124502.

@tobim tobim changed the title [staging-next] cmake: Fix on darwin-arm64 [staging-next] cmake: Fix embedded curl on darwin Jul 30, 2021
@tobim tobim marked this pull request as draft July 30, 2021 08:10
@FRidh FRidh added this to the 21.11 milestone Jul 30, 2021
@tobim tobim force-pushed the pkgs/cmake-3.21-darwin branch from 9c222c1 to 2a0d658 Compare August 2, 2021 19:32
@tobim
cmake: Fix on darwin-arm64
40f6c13 
Adds the SystemConfiguration framework to buildInputs unless we're
bootstrapping.

For the bootstrap version, we revert
curl/curl@31f631a
instead so CMake builds without SystemConfiguration.
@tobim tobim force-pushed the pkgs/cmake-3.21-darwin branch from 2a0d658 to 40f6c13 Compare August 2, 2021 19:39
@ofborg ofborg bot requested review from np, lovek323, edolstra and andir August 2, 2021 19:47
@ofborg ofborg bot added 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ and removed 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Aug 2, 2021
@SuperSandro2000
Copy link
Member

@ofborg build cmake

@tobim tobim mentioned this pull request Aug 12, 2021
Merged
11 tasks
@tobim
Copy link
Contributor Author

tobim commented Aug 12, 2021

I opened #133601 targeting staging instead.

@tobim tobim deleted the pkgs/cmake-3.21-darwin branch August 13, 2021 08:40
@veprbl veprbl mentioned this pull request Aug 21, 2021
Merged
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 requested changes

@FRidh FRidh FRidh left review comments

@veprbl veprbl veprbl left review comments

@LnL7 LnL7 Awaiting requested review from LnL7

@ttuegel ttuegel Awaiting requested review from ttuegel

@np np Awaiting requested review from np

@lovek323 lovek323 Awaiting requested review from lovek323

@edolstra edolstra Awaiting requested review from edolstra

@andir andir Awaiting requested review from andir

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
None yet
Milestone
21.11
Development

Successfully merging this pull request may close these issues.
4 participants
@tobim @SuperSandro2000 @veprbl @FRidh