fix build

2 files changed, 37 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 197827cf38f2..5ee65092cc93 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,12 @@
 pkgbase = android-messages-desktop
 	pkgdesc = Android Messages as a cross-platform desktop app
 	pkgver = 5.1.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/OrangeDrangon/android-messages-desktop
 	arch = x86_64
 	license = MIT
 	makedepends = git
+	makedepends = nvm
 	makedepends = yarn
 	depends = electron11
 	optdepends = libnotify: desktop notifications
@@ -18,4 +19,3 @@ pkgbase = android-messages-desktop
 	sha256sums = 1bf16b8864712b0c1de72d8c3764db14b75ecf64dae44d206a26aa036ac53b1a
 
 pkgname = android-messages-desktop
-
diff --git a/PKGBUILD b/PKGBUILD
index 088172fe563b..315e546e3014 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Mark Wagie <mark dot wagie at tutanota dot com>
 pkgname=android-messages-desktop
 pkgver=5.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Android Messages as a cross-platform desktop app"
 arch=('x86_64')
 url="https://github.com/OrangeDrangon/android-messages-desktop"
 license=('MIT')
 depends=('electron11')
-makedepends=('git' 'yarn')
+makedepends=('git' 'nvm' 'yarn')
 optdepends=('libnotify: desktop notifications'
             'libappindicator-gtk3: tray icon')
 source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
@@ -17,26 +17,43 @@ sha256sums=('616a3174809e60356ca9204fdb7a9d319f705746ed67533da95ea682d974231d'
             '5d4a885c7a4cf6330df5b00b39f51da85af38c715ed72233286bd296f2bb2c57'
             '1bf16b8864712b0c1de72d8c3764db14b75ecf64dae44d206a26aa036ac53b1a')
 
+_ensure_local_nvm() {
+  # let's be sure we are starting clean
+  which nvm >/dev/null 2>&1 && nvm deactivate && nvm unload
+  export NVM_DIR="$srcdir/.nvm"
+
+  # The init script returns 3 if version specified
+  # in ./.nvrc is not (yet) installed in $NVM_DIR
+  # but nvm itself still gets loaded ok
+  source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
+}
+
+prepare() {
+  export npm_config_cache="$srcdir/npm_cache"
+  _ensure_local_nvm
+  nvm install 14.18.0
+}
+
 build() {
-	cd "$pkgname-$pkgver"
-	yarn --cache-folder "$srcdir/yarn-cache"
-	yarn build
-	./node_modules/.bin/electron-builder --linux dir
+  cd "$pkgname-$pkgver"
+  _ensure_local_nvm
+  yarn --cache-folder "$srcdir/yarn-cache"
+  yarn build
+  ./node_modules/.bin/electron-builder --linux dir
 }
 
 package() {
-	cd "$pkgname-$pkgver"
-	install -d "$pkgdir/usr/lib/$pkgname"
-	cp -r dist/linux-unpacked/resources "$pkgdir/usr/lib/$pkgname"
+  cd "$pkgname-$pkgver"
+  install -d "$pkgdir/usr/lib/$pkgname"
+  cp -r dist/linux-unpacked/resources "$pkgdir/usr/lib/$pkgname"
 
-	install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
-	install -Dm644 "$srcdir/$pkgname.desktop" -t "$pkgdir/usr/share/applications"
-	install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname"
+  install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
+  install -Dm644 "$srcdir/$pkgname.desktop" -t "$pkgdir/usr/share/applications"
+  install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname"
 
-	for icon_size in 16 24 32 48 64 128 256 512 1024; do
-		icons_dir=/usr/share/icons/hicolor/${icon_size}x${icon_size}/apps
-		install -d $pkgdir$icons_dir
-		install -m644 resources/icons/${icon_size}x${icon_size}.png \
-			$pkgdir$icons_dir/$pkgname.png
-	done
+  for icon_size in 16 24 32 48 64 128 256 512 1024; do
+    icons_dir=/usr/share/icons/hicolor/${icon_size}x${icon_size}/apps
+    install -Dm644 resources/icons/${icon_size}x${icon_size}.png \
+      $pkgdir$icons_dir/$pkgname.png
+  done
 }