Skip to content

rewrite-tbd: avoid infinite recursion when cmake is not cmakeMinimal#234855

Merged
wegank merged 1 commit intoNixOS:stagingfrom
reckenrode:rewrite-tbd-fix
May 31, 2023
Merged

rewrite-tbd: avoid infinite recursion when cmake is not cmakeMinimal#234855
wegank merged 1 commit intoNixOS:stagingfrom
reckenrode:rewrite-tbd-fix

Conversation

@reckenrode
Copy link
Copy Markdown
Contributor

Description of changes

This was found while working on the Darwin stdenv rework. This change allows rewrite-tbd to use the provided Makefile instead of depending on cmake and pkg-config.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release 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 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels May 29, 2023
This was found while working on the Darwin stdenv rework. This change
allows rewrite-tbd to use the provided Makefile instead of depending on
cmake and pkg-config.

Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com>
@reckenrode
Copy link
Copy Markdown
Contributor Author

Thanks for the feedback. I’ve incorporated the changes and squashed the commits.

@wegank wegank merged commit 7849b5f into NixOS:staging May 31, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants