From 73e6ba08722485be6a4e818b21c41c4665170ad2 Mon Sep 17 00:00:00 2001
From: Franziska Kunsmann <hi@kunsmann.eu>
Date: Sat, 5 Nov 2022 07:47:07 +0100
Subject: [PATCH] =?UTF-8?q?bundles/{matrix-dimension,mx-puppet-discord}:?=
 =?UTF-8?q?=20nodejs-dependency-h=C3=B6lle,=20once=20again?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bundles/matrix-dimension/items.py     | 6 +++++-
 bundles/mx-puppet-discord/items.py    | 5 +++++
 bundles/mx-puppet-discord/metadata.py | 9 +++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/bundles/matrix-dimension/items.py b/bundles/matrix-dimension/items.py
index 36aa83d..9744754 100644
--- a/bundles/matrix-dimension/items.py
+++ b/bundles/matrix-dimension/items.py
@@ -51,7 +51,11 @@ files = {
 
 actions = {
     'matrix_dimension_build': {
-        'command': 'cd ' + node.metadata.get('matrix-dimension/install_dir') + ' && sudo -u matrix-dimension npm install && sudo -u matrix-dimension npm run build',
+        'command': ' && '.join([
+            'cd ' + node.metadata.get('matrix-dimension/install_dir'),
+            'sudo -u matrix-dimension npm install --legacy-peer-deps',
+            'sudo -u matrix-dimension NODE_OPTIONS=--openssl-legacy-provider npm run build',
+        ]),
         'needs': {
             'pkg_apt:nodejs',
         },
diff --git a/bundles/mx-puppet-discord/items.py b/bundles/mx-puppet-discord/items.py
index 8e17928..e6a2837 100644
--- a/bundles/mx-puppet-discord/items.py
+++ b/bundles/mx-puppet-discord/items.py
@@ -78,7 +78,12 @@ actions = {
         'command': 'cd /opt/mx-puppet-discord/src && sudo -u mx-puppet-discord yarn install',
         'needs': {
             'action:mx-puppet-discord_chown',
+            'pkg_apt:libcairo2-dev',
+            'pkg_apt:libgif-dev',
+            'pkg_apt:libpango1.0-dev',
+            'pkg_apt:libpixman-1-dev',
             'pkg_apt:nodejs',
+            'pkg_apt:pkg-config',
             'user:mx-puppet-discord',
         },
         'triggered': True,
diff --git a/bundles/mx-puppet-discord/metadata.py b/bundles/mx-puppet-discord/metadata.py
index b2590e0..5b84a6c 100644
--- a/bundles/mx-puppet-discord/metadata.py
+++ b/bundles/mx-puppet-discord/metadata.py
@@ -1,4 +1,13 @@
 defaults = {
+    'apt': {
+        'packages': {
+            'libcairo2-dev': {},
+            'libgif-dev': {},
+            'libpango1.0-dev': {},
+            'libpixman-1-dev': {},
+            'pkg-config': {},
+        },
+    },
     'matrix-synapse': {
         'appservice_configs': {
             '/opt/mx-puppet-discord/registration.yaml',