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

Jump to bottom

cmake: Don't be target sensitive #99396

Merged
merged 1 commit into from Oct 13, 2020
Merged

cmake: Don't be target sensitive #99396

merged 1 commit into from Oct 13, 2020

Conversation

Ericson2314
Copy link
Member

Motivation for this change

pkg-config now has a target-sensative wrapper. We shouldn't rebuild
CMake because that wrapper changes. The setup hook should also be a
build time dep.

Fix #99325

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.

@Ericson2314
cmake: Don't be target sensative
54b7d52 
pkg-config now has a target-sensative wrapper. We shouldn't rebuild
CMake because that wrapper changes. The setup hook should also be a
build time dep.

Fix NixOS#99325
@Ericson2314 Ericson2314 requested a review from LnL7 October 2, 2020 15:06
LnL7
LnL7 approved these changes Oct 2, 2020
View reviewed changes
Copy link
Member

@LnL7 LnL7 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Assuming this doesn't break for some weird reason, but I think this is just dated from before cross was a thing.

@ofborg ofborg bot requested review from LnL7 and ttuegel October 2, 2020 19:40
@Ericson2314 Ericson2314 changed the title cmake: Don't be target sensative cmake: Don't be target sensitive Oct 3, 2020
@Ericson2314
Copy link
Member Author

Passed on x86_64 linux at least. Waiting on the others, but I don't think this would cause a target-specific problem.

@Ericson2314 Ericson2314 merged commit 3f93b59 into NixOS:staging Oct 13, 2020
@Ericson2314 Ericson2314 deleted the cmake-nativeBuildInputs branch October 13, 2020 23:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LnL7 LnL7 Awaiting requested review from LnL7

@ttuegel ttuegel Awaiting requested review from ttuegel

Assignees
No one assigned
Labels
10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-darwin-stdenv 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@Ericson2314 @LnL7