Skip to content

phd2: fix build, use system libraries#450835

Merged
leona-ya merged 1 commit intoNixOS:masterfrom
returntoreality:phd2-fix
Oct 11, 2025
Merged

phd2: fix build, use system libraries#450835
leona-ya merged 1 commit intoNixOS:masterfrom
returntoreality:phd2-fix

Conversation

@returntoreality
Copy link
Contributor

@returntoreality returntoreality commented Oct 10, 2025 •
edited
Loading

Cmake 4 broke the build. Using now the system libraries instead of the bundled ones were possible.

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

Add a 👍 reaction to pull requests you find important.

@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 9.needs: reviewer This PR currently has no reviewers requested and needs attention. labels Oct 10, 2025
drupol
drupol reviewed Oct 11, 2025
View reviewed changes
Copy link
Contributor

@drupol drupol left a comment

Choose a reason for hiding this comment

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

Can you also fix the PR title accordingly?

@nixpkgs-ci nixpkgs-ci bot removed the 9.needs: reviewer This PR currently has no reviewers requested and needs attention. label Oct 11, 2025
@returntoreality returntoreality changed the title Phd2 fix build phd2: fix build, use system libraries Oct 11, 2025
drupol
drupol approved these changes Oct 11, 2025
View reviewed changes
Copy link
Contributor

@drupol drupol left a comment

Choose a reason for hiding this comment

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

Thanks !

Adding the epic tracking these changes: #445447

@nixpkgs-ci nixpkgs-ci bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Oct 11, 2025
@leona-ya
Copy link
Member

leona-ya commented Oct 11, 2025

Very most likely, cmake4 didn't broke the build, but still thanks for the patch.

@leona-ya leona-ya added this pull request to the merge queue Oct 11, 2025
Merged via the queue into NixOS:master with commit b19fee0 Oct 11, 2025
28 of 32 checks passed
@returntoreality
Copy link
Contributor Author

returntoreality commented Oct 11, 2025

Very most likely, cmake4 didn't broke the build, but still thanks for the patch.

It broke the bundled gtest which had cmake_minimum_required(VERSION 2.6.2). That is why I changed it to use the system packages where possible.

Thanks for merging it!

@Sigmanificient Sigmanificient mentioned this pull request Oct 12, 2025
Open
@returntoreality returntoreality deleted the phd2-fix branch October 12, 2025 16:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@drupol drupol drupol approved these changes

@leona-ya leona-ya leona-ya approved these changes

Assignees

No one assigned

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@returntoreality @leona-ya @drupol