fix errors

2 files changed, 23 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3fb1530ed15a..972f73b6fcdc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,15 @@
 pkgbase = issie
 	pkgdesc = An intuitive cross-platform hardware design application.
 	pkgver = 4.1.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://tomcl.github.io/issie
 	arch = any
 	license = GPL3
-	makedepends = nodejs>=18
+	makedepends = nvm
 	makedepends = npm
 	makedepends = dotnet-sdk>=7
 	makedepends = gendesk
+	makedepends = git
 	depends = expat
 	depends = at-spi2-core
 	depends = nspr
@@ -29,8 +30,7 @@ pkgbase = issie
 	depends = alsa-lib
 	depends = gtk3
 	conflicts = issie
-	source = issie-4.1.0.tar.gz::https://github.com/tomcl/issie/archive/refs/tags/v4.1.0.tar.gz
-	sha256sums = b747eaa4301f4f47c400f78d191c458110d5dfaf3a910429f2600c754bb9c132
-	sha256sums = 81dc5466d488db9e26489a5a00af471dc4529e20509a94b5a030619a471f972f
+	source = issie-4.1.0::git+https://github.com/tomcl/issie.git#tag=v4.1.0
+	sha256sums = SKIP
 
 pkgname = issie
diff --git a/PKGBUILD b/PKGBUILD
index a8d7e62ca083..d823fca3fa1c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,8 @@
 # Contributor: Shuyuan Liu <liu_shuyuan at qq dot com>
 pkgname=issie
 pkgver=4.1.0
-pkgrel=2
+_electronversion=24
+pkgrel=3
 pkgdesc="An intuitive cross-platform hardware design application."
 arch=('any')
 url="https://tomcl.github.io/issie"
@@ -31,19 +32,31 @@ depends=(
     'gtk3'
 )
 makedepends=(
-    'nodejs>=18'
+    'nvm'
     'npm'
     'dotnet-sdk>=7'
     'gendesk'
+    'git'
 )
 source=(
-    "${pkgname}-${pkgver}.tar.gz::${_ghurl}/archive/refs/tags/v$pkgver.tar.gz"
+    "${pkgname}-${pkgver}::git+${_ghurl}.git#tag=v${pkgver}"
 )
-sha256sums=('b747eaa4301f4f47c400f78d191c458110d5dfaf3a910429f2600c754bb9c132'
-            '81dc5466d488db9e26489a5a00af471dc4529e20509a94b5a030619a471f972f')
+sha256sums=('SKIP')
+_ensure_local_nvm() {
+    export NVM_DIR="${srcdir}/.nvm"
+    source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
+    nvm install 18
+    nvm use 18
+}
 build() {
+    _ensure_local_nvm
     gendesk -q -f -n --categories "Development" --name "${pkgname}" --exec "${pkgname} --no-sandbox %U"
     cd "${srcdir}/${pkgname}-${pkgver}"
+    export npm_config_build_from_source=true
+    export npm_config_cache="${srcdir}/.npm_cache"
+    export ELECTRON_SKIP_BINARY_DOWNLOAD=1
+    export SYSTEM_ELECTRON_VERSION="$(electron${_electronversion} -v | sed 's/v//g')"
+    export ELECTRONVERSION="${_electronversion}"
     dotnet tool restore
     dotnet paket install
     npm ci