Details

Reviewers

varun
• max
• jim

Commits

rCOMM9122b99941b2: Add amqp-cpp

Summary

Add tunnelbroker's amqp-cpp dependency.

This isn't currently available in nixpkgs, so we need to package it locally.

Depends on D3784

Test Plan

nix build .#amqp-cpp

Diff Detail

Repository

rCOMM Comm

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

• jon created this revision.Apr 20 2022, 2:12 PM

Herald added subscribers: • abosh, • benschac, • karol and 4 others. · View Herald TranscriptApr 20 2022, 2:12 PM

Harbormaster returned this revision to the author for changes because remote builds failed.Apr 20 2022, 2:13 PM

Harbormaster failed remote builds in B8364: Diff 11676!

Accidental inclusion of unstaged files

Harbormaster completed remote builds in B8365: Diff 11677.Apr 20 2022, 2:21 PM

• jon requested review of this revision.Apr 20 2022, 2:21 PM

Fix build with tcp extension

Harbormaster completed remote builds in B8367: Diff 11679.Apr 20 2022, 2:29 PM

Remove accidental tunnelbroker mention

Harbormaster completed remote builds in B8614: Diff 11998.Apr 27 2022, 10:14 AM

think i should be a reviewer on this

Adding @geekbrother because AMQP pertains to Tunnelbroker, and adding @jimpo because there's some CMake stuff here

• jon added a child revision: D3865: Add protobuf with corrected cmake build.Apr 27 2022, 2:33 PM

I think the package is available as libamqpcpp in nix packages. I'm not sure it's built with the -DAMQP-CPP_LINUX_TCP=ON.
But maybe it would be easier to use it and just pass the flags to the nix build, and nix rebuilds it. @jonringer-comm, what do you think?

• max requested changes to this revision.May 2 2022, 4:10 AM

This revision now requires changes to proceed.May 2 2022, 4:10 AM

@geekbrother you're right, but it looks like it just uses the exported makeFile to build the project https://github.com/NixOS/nixpkgs/blob/634141959076a8ab69ca2cca0f266852256d79ee/pkgs/development/libraries/libamqpcpp/default.nix

The implications is that it doesn't export a cmake/amqpcppConfig.cmake

@jonringer-comm make sure to hit "Re-request review" in the dropdown at the bottom of the page, to make sure this diff goes back to @geekbrother's queue and he sees your response!

• jon requested review of this revision.May 2 2022, 12:54 PM

In D3793#108796, @jonringer-comm wrote:

@geekbrother you're right, but it looks like it just uses the exported makeFile to build the project https://github.com/NixOS/nixpkgs/blob/634141959076a8ab69ca2cca0f266852256d79ee/pkgs/development/libraries/libamqpcpp/default.nix

The implications is that it doesn't export a cmake/amqpcppConfig.cmake

That seems like a solution here. Thank you for the clarification @jonringer-comm !

varun accepted this revision.May 5 2022, 10:58 AM

This revision is now accepted and ready to land.May 5 2022, 10:58 AM

Closed by commit rCOMM9122b99941b2: Add amqp-cpp (authored by • jon). · Explain WhyMay 6 2022, 2:15 AM

This revision was automatically updated to reflect the committed changes.

• jon added a commit: rCOMM9122b99941b2: Add amqp-cpp.

• karol removed a subscriber: • karol.May 6 2022, 3:55 AM