Skip to content

arrow-cpp: fixup after protobuf bump#249420

Merged
vcunat merged 1 commit intoNixOS:staging-nextfrom
tobim:pkgs/arrow-cpp-fix-protobuf
Aug 16, 2023
Merged

arrow-cpp: fixup after protobuf bump#249420
vcunat merged 1 commit intoNixOS:staging-nextfrom
tobim:pkgs/arrow-cpp-fix-protobuf

Conversation

@tobim
Copy link
Copy Markdown
Contributor

@tobim tobim commented Aug 16, 2023

Description of changes

This solves a CMake dependency resolution issue. Arrows FindProtobufAlt module looks for Protobuf with an uppercase P, which is matched by another find module that is provided by CMake itself. When it gets to look for grpc that tries to resolve protobuf with a lowercase p, which is matched by the upstream provided protobuf-config.cmake. At this point conflicting target definitions are detected and the configuration process aborts.

The patch proposed here modifies the arrow module so that it will protobuf-config.cmake as well.

Targeting #248496.

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.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.

@vcunat
Copy link
Copy Markdown
Member

vcunat commented Aug 16, 2023

@ofborg eval

@vcunat vcunat merged commit 65f7e5d into NixOS:staging-next Aug 16, 2023
@vcunat vcunat mentioned this pull request Aug 16, 2023
2 tasks
@tobim tobim deleted the pkgs/arrow-cpp-fix-protobuf branch August 16, 2023 11:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants