From 8f2c67d5dd9fabc007fdf4e15dd1dfaf829de38f Mon Sep 17 00:00:00 2001 From: sterni Date: Mon, 3 Oct 2022 12:47:06 +0200 Subject: chore(3p/sources): Bump channels & overlays * //3p/overlays/tvl: apply more or less questionable compilation fix for electrum with protobuf >= 4. Change-Id: Iedbc45cb96b9e5382e304f2cd5ed9fc1c13f7884 Reviewed-on: https://cl.tvl.fyi/c/depot/+/6850 Tested-by: BuildkiteCI Reviewed-by: tazjin --- third_party/overlays/tvl.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'third_party/overlays') diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index 7eb0d22fc8..62f4116a17 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -90,4 +90,19 @@ in meta.ci.skip = true; }; })); + + + # Build electrum with protobuf >= 4 by following hypothetical instructions from + # upstream commit that pins to < 4 + # https://github.com/spesmilo/electrum/commit/52b73880f95be5cf51742fec10cde0a2e4b23de4 + # https://github.com/NixOS/nixpkgs/pull/194112 + electrum = super.electrum.overrideAttrs (old: { + postPatch = '' + # make compatible with protobuf4 by easing dependencies ... + substituteInPlace ./contrib/requirements/requirements.txt \ + --replace "protobuf>=3.12,<4" "protobuf>=3.12" + # ... and regenerating the paymentrequest_pb2.py file + protoc --python_out=. electrum/paymentrequest.proto + '' + old.postPatch or ""; + }); } -- cgit 1.4.1