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

default-crate-overrides: prost-build needs protobuf #189026

Closed
wants to merge 1 commit into from
Closed

default-crate-overrides: prost-build needs protobuf #189026

wants to merge 1 commit into from

Conversation

ghost
Copy link

@ghost ghost commented Aug 30, 2022

Description of changes

The prost-build crate expects to find the protobuf binary at a location pointed to by $PROTOC. This adds that.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • 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/)
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Aug 30, 2022
@ghost
Copy link
Author

ghost commented Jan 2, 2023

Resolved merge conflict.

@alyssais alyssais added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 13, 2023
@ghost
Copy link
Author

ghost commented Jan 22, 2023

Resolved merge conflict.

@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 22, 2023
@@ -202,6 +203,11 @@ in
buildInputs = [ pango ];
};

prost-build = attrs: {
nativeBuildInputs = [ protobuf ];
PROTOC = "${lib.getBin protobuf}/bin/protoc";
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
PROTOC = "${lib.getBin protobuf}/bin/protoc";
PROTOC = lib.getExe buildPackages.protobuf;

@Artturin
Copy link
Member

#224892

@Artturin Artturin closed this Apr 22, 2023
@ghost ghost deleted the pr/default-crate-overrides/prost-build branch April 24, 2023 00:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: rust 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 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