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

cmake: fix CMAKE_FIND_FRAMEWORK #96517

Merged
merged 1 commit into from Aug 29, 2020
Merged

Conversation

marsam
Copy link
Contributor

@marsam marsam commented Aug 28, 2020

Motivation for this change

#94090 was reverted from master, but it didn't land into staging.

cc: @matthewbauer

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.

@FRidh
Copy link
Member

FRidh commented Aug 28, 2020

#94090 was reverted from master, but it didn't land into staging.

Do you mean the change got reverted, and is now not present in any of the branches? Because that indeed seems to be the case.

@marsam
Copy link
Contributor Author

marsam commented Aug 28, 2020

Do you mean the change got reverted, and is now not present in any of the branches? Because that indeed seems to be the case.

yes. It got reverted from master given the number of rebuilds #94090 (comment)

@FRidh FRidh merged commit 3106c30 into NixOS:staging Aug 29, 2020
Staging automation moved this from Ready to Done Aug 29, 2020
@vcunat
Copy link
Member

vcunat commented Sep 6, 2020

Cross-ref: 3106c30#commitcomment-42069399

@FRidh
Copy link
Member

FRidh commented Sep 6, 2020

cc @matthewbauer

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Staging
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

4 participants