From 3ef02df04086a53a159d6c265fc77d543cfcdc91 Mon Sep 17 00:00:00 2001
From: Ben Grande <ben.grande.b@gmail.com>
Date: Sun, 18 Feb 2024 17:05:30 +0100
Subject: [PATCH] fix: electrum install zbar and protobuf

---
 salt/electrum/configure-builder.sls | 9 ++++++++-
 salt/electrum/install-builder.sls   | 1 +
 salt/electrum/install.sls           | 3 +++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/salt/electrum/configure-builder.sls b/salt/electrum/configure-builder.sls
index 4df2fae..756dd5f 100644
--- a/salt/electrum/configure-builder.sls
+++ b/salt/electrum/configure-builder.sls
@@ -111,10 +111,17 @@ include:
     - overwrite: True
     - clean: True
 
-"{{ slsdotpath }}-copy-files-to-template":
+"{{ slsdotpath }}-generate-payment-request":
   cmd.run:
     - require:
       - archive: "{{ slsdotpath }}-extract-archive"
+    - name: ./contrib/generate_payreqpb2.sh
+    - cwd: /tmp/{{ electrum_archive_dir }}
+
+"{{ slsdotpath }}-copy-files-to-template":
+  cmd.run:
+    - require:
+      - cmd: "{{ slsdotpath }}-generate-payment-request"
     - name: qrexec-client-vm -T -- @default qusal.InstallElectrum /usr/lib/qubes/qfile-agent electrum/ run_electrum electrum.desktop
     - cwd: /tmp/{{ electrum_archive_dir }}
     - runas: user
diff --git a/salt/electrum/install-builder.sls b/salt/electrum/install-builder.sls
index 3073fab..928365b 100644
--- a/salt/electrum/install-builder.sls
+++ b/salt/electrum/install-builder.sls
@@ -28,5 +28,6 @@ include:
       - ca-certificates
       - curl
       - tar
+      - protobuf-compiler
 
 {% endif -%}
diff --git a/salt/electrum/install.sls b/salt/electrum/install.sls
index 1af9094..e8a686a 100644
--- a/salt/electrum/install.sls
+++ b/salt/electrum/install.sls
@@ -31,6 +31,9 @@ include:
     - skip_suggestions: True
     - pkgs:
       - socat
+      - man-db
+      ## Recommends
+      - python3-zbar
       ## Unlisted dependency.
       - python3-jsonpatch
       ## Dependencies retrieved from 'electrum' and 'python3-electrum' pkg.