fix errors

3 files changed, 19 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 33ffb359c720..5051dfff6e27 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,21 @@
 pkgbase = nuclear-player
 	pkgdesc = A free, multiplatform music player app that streams from multiple sources.
 	pkgver = 0.6.30
-	pkgrel = 4
+	pkgrel = 5
 	url = http://nuclear.gumblert.tech/
 	arch = any
-	license = AGPL3
+	license = AGPL-3.0-only
 	makedepends = gendesk
 	makedepends = npm
 	makedepends = nvm
-	makedepends = make
+	makedepends = base-devel
 	makedepends = gcc
 	makedepends = git
-	makedepends = python
+	makedepends = python>=3
 	depends = electron12
 	source = nuclear-player.git::git+https://github.com/nukeop/nuclear#tag=v0.6.30
 	source = nuclear-player.sh
 	sha256sums = SKIP
-	sha256sums = d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231
+	sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014
 
 pkgname = nuclear-player
diff --git a/PKGBUILD b/PKGBUILD
index 0eea342eba75..b99a9392252d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,12 +5,12 @@ _pkgname="Nuclear Player"
 pkgver=0.6.30
 _electronversion=12
 _nodeversion=18
-pkgrel=4
+pkgrel=5
 pkgdesc="A free, multiplatform music player app that streams from multiple sources."
 arch=('any')
 url="http://nuclear.gumblert.tech/"
 _ghurl="https://github.com/nukeop/nuclear"
-license=('AGPL3')
+license=('AGPL-3.0-only')
 depends=(
     "electron${_electronversion}"
 )
@@ -18,17 +18,17 @@ makedepends=(
     'gendesk'
     'npm'
     'nvm'
-    'make'
+    'base-devel'
     'gcc'
     'git'
-    'python'
+    'python>=3'
 )
 source=(
     "${pkgname}.git::git+${_ghurl}#tag=v${pkgver}"
     "${pkgname}.sh"
 )
 sha256sums=('SKIP'
-            'd4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231')
+            '0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014')
 _ensure_local_nvm() {
     export NVM_DIR="${srcdir}/.nvm"
     source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
@@ -38,16 +38,19 @@ _ensure_local_nvm() {
 build() {
     sed -e "s|@electronversion@|${_electronversion}|" \
         -e "s|@appname@|${pkgname}|g" \
-        -e "s|@appasar@|app.asar|g" \
+        -e "s|@runname@|app.asar|g" \
         -i "${srcdir}/${pkgname}.sh"
     _ensure_local_nvm
-    gendesk -q -f -n --categories "AudioVideo" --name "${_pkgname}" --exec "${pkgname}"
+    gendesk -q -f -n --categories="AudioVideo" --name="${_pkgname}" --exec="${pkgname} %U"
     cd "${srcdir}/${pkgname}.git"
     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 npm_config_target="${SYSTEM_ELECTRON_VERSION}"
     export ELECTRONVERSION="${_electronversion}"
+    export npm_config_disturl=https://electronjs.org/headers
+    HOME="${srcdir}/.electron-gyp"
     sed -e '/"snap"/d;/"tar.gz",/d;/"rpm",/d;/"deb",/d;s|"AppImage",|"AppImage"|g;s|env.VERSION|version|g' -i package.json
     npm ci
     npm run build:linux
diff --git a/nuclear-player.sh b/nuclear-player.sh
index aacd8f895847..f9ced1432cfc 100644
--- a/nuclear-player.sh
+++ b/nuclear-player.sh
@@ -1,15 +1,14 @@
 #!/bin/sh
 set -e
 _APPDIR="/usr/lib/@appname@"
-_ASAR="${_APPDIR}/@appasar@"
+_RUNNAME="${_APPDIR}/@runname@"
 export PATH="${_APPDIR}:${PATH}"
 export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
 export ELECTRON_IS_DEV=0
 export NODE_ENV=production
 cd "${_APPDIR}"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    exec electron@electronversion@ "${_ASAR}" "$@"
+    exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $?
 else
-    exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
-fi
-exit
\ No newline at end of file
+    exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $?
+fi
\ No newline at end of file