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

[staging-next] python3Packages.libarcus: fix build against protobuf 3.18+ #138565

Merged
merged 1 commit into from Sep 23, 2021

Conversation

r-burns
Copy link
Contributor

@r-burns r-burns commented Sep 19, 2021

Still needs upstream resolution (Ultimaker/libArcus#121), but we can grab a Void Linux Vcpkg patch in the meantime

Motivation for this change

For #138268

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 via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all packages 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/)
  • 21.11 Release Notes (or backporting 21.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.

@r-burns r-burns changed the title python3Packages.libarcus: fix build against protobuf 3.18+ [staging-next] python3Packages.libarcus: fix build against protobuf 3.18+ Sep 19, 2021
@r-burns
Copy link
Contributor Author

r-burns commented Sep 19, 2021

Result of nixpkgs-review pr 138565 run on x86_64-linux 1

6 packages built:
  • cura
  • curaengine
  • python38Packages.libarcus
  • python38Packages.uranium
  • python39Packages.libarcus
  • python39Packages.uranium

@gebner
Copy link
Member

gebner commented Sep 20, 2021

Removing the return in the error case looks a bit fishy to me, but as long as it works I'm happy. Did you try cura?

@r-burns
Copy link
Contributor Author

r-burns commented Sep 20, 2021

Hmm you're right, that is kind of suspicious. I haven't tried running any dependencies but that seems like a good idea.

Still needs upstream resolution,
but we can grab a Vcpkg patch in the meantime
@r-burns
Copy link
Contributor Author

r-burns commented Sep 23, 2021

@gebner I found a more surgical patch on Vcpkg. Built cura, not sure what to test though.

@lukegb
Copy link
Contributor

lukegb commented Sep 23, 2021

I'm going to merge this as is; the patch looks good, so if cura builds then let's roll with it.

@lukegb lukegb merged commit 2a102dd into NixOS:staging-next Sep 23, 2021
@r-burns r-burns deleted the libarcus branch September 23, 2021 15:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants