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

openbrf: fix build #266721

Merged
merged 1 commit into from
Nov 11, 2023
Merged

openbrf: fix build #266721

merged 1 commit into from
Nov 11, 2023

Conversation

pbsds
Copy link
Member

@pbsds pbsds commented Nov 10, 2023

Description of changes

ZHF: #265948
https://hydra.nixos.org/build/239129983

patch BoundaryWeight into BoundaryQuadricWeight and QualityQuadricWeight
add eigen to include path as it is no longer in the vcg include directory

openbrf
vcglib

This was originally, and superseeds #266190

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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.11 Release Notes (or backporting 23.05 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.

@pbsds pbsds marked this pull request as ready for review November 10, 2023 19:47
@ofborg ofborg bot requested a review from abbradar November 10, 2023 21:02
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Nov 10, 2023
@MikaelFangel MikaelFangel added the 0.kind: ZHF Fixes Fixes during the Zero Hydra Failures (ZHF) campaign label Nov 10, 2023
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

sorry -- forgot about the requirement of creating an issue upstream.

pkgs/applications/misc/openbrf/default.nix Outdated Show resolved Hide resolved
patch BoundaryWeight into BoundaryQuadricWeight and QualityQuadricWeight
add eigen to include path as it is no longer in the vcg include directory
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

looks good.
FWIW: can use the file reference.brf openbrf reference.brf and can play around with some mesh things and animations. seems to work though i was not able to trigger the code modified in the patch from casual usage.

@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 10, 2023
@happysalada happysalada merged commit d183e69 into NixOS:master Nov 11, 2023
23 of 24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0.kind: ZHF Fixes Fixes during the Zero Hydra Failures (ZHF) campaign 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants