From b35acea7efc178ecfa15dd3bfc855019aaacea24 Mon Sep 17 00:00:00 2001
From: Mark Wagie <mark.wagie@proton.me>
Date: Sat, 3 May 2025 11:48:14 -0600
Subject: [PATCH] 1.8.1

---
 .SRCINFO |  8 ++++----
 PKGBUILD | 21 ++++++++++++++++++---
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index d179fe943ef7..697daf058a4e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
 pkgbase = materialious
 	pkgdesc = Modern material design for Invidious.
-	pkgver = 1.8.0
+	pkgver = 1.8.1
 	pkgrel = 1
 	url = https://materialio.us
 	arch = x86_64
 	license = AGPL-3.0-or-later
 	makedepends = desktop-file-utils
-	makedepends = npm
+	makedepends = nvm
 	makedepends = python
 	depends = electron35
-	source = Materialious-1.8.0.tar.gz::https://github.com/Materialious/Materialious/archive/refs/tags/1.8.0.tar.gz
+	source = Materialious-1.8.1.tar.gz::https://github.com/Materialious/Materialious/archive/refs/tags/1.8.1.tar.gz
 	source = materialious.sh
-	sha256sums = 9eafc317bfe3ec1e724a06ca104aaf1a93af48add6ba9b733c76a8eedd75e13f
+	sha256sums = d83ac4a93b85d52fa6ed7cd6a9bafb85e032ccc808fd7041c46b720204dab6c4
 	sha256sums = 2109a2f0353f1cc04e12539f55ed4dbb58d59f4d12e000d86f6668369c224c4c
 
 pkgname = materialious
diff --git a/PKGBUILD b/PKGBUILD
index 37f2fd9285ed..867938ded900 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
 # Maintainer: Mark Wagie <mark dot wagie at proton dot me>
 pkgname=materialious
 _app_id=us.materialio.Materialious
-pkgver=1.8.0
+pkgver=1.8.1
 pkgrel=1
+_nodeversion=22
 _electronversion=35
 pkgdesc="Modern material design for Invidious."
 arch=('x86_64')
@@ -11,16 +12,29 @@ license=('AGPL-3.0-or-later')
 depends=("electron${_electronversion}")
 makedepends=(
   'desktop-file-utils'
-  'npm'
+  'nvm'
   'python'
 )
 source=("Materialious-$pkgver.tar.gz::https://github.com/Materialious/Materialious/archive/refs/tags/$pkgver.tar.gz"
         "$pkgname.sh")
-sha256sums=('9eafc317bfe3ec1e724a06ca104aaf1a93af48add6ba9b733c76a8eedd75e13f'
+sha256sums=('d83ac4a93b85d52fa6ed7cd6a9bafb85e032ccc808fd7041c46b720204dab6c4'
             '2109a2f0353f1cc04e12539f55ed4dbb58d59f4d12e000d86f6668369c224c4c')
 
+_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() {
   cd "Materialious-$pkgver/$pkgname/electron"
+  _ensure_local_nvm
+  nvm install "${_nodeversion}"
 
   # Set desktop file Exec
   desktop-file-edit --set-key=Exec --set-value="$pkgname" "$pkgname.desktop"
@@ -35,6 +49,7 @@ build() {
   export ELECTRON_SKIP_BINARY_DOWNLOAD=1
   electronDist="/usr/lib/electron${_electronversion}"
   electronVer="$(sed s/^v// /usr/lib/electron${_electronversion}/version)"
+   _ensure_local_nvm
   npm install
   npm run build
   npx cap telemetry off