summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Wagie2020-09-28 22:22:50 -0600
committerMark Wagie2020-09-28 22:22:50 -0600
commit128291b5a87ccea43c6f471f1c8e154faaed644e (patch)
treecbdef556a427d3ce45980057f46d1e438a5c8f0c
parent3454bc9a7d2c80d67ec744821853954101e4d8b9 (diff)
downloadaur-128291b5a87ccea43c6f471f1c8e154faaed644e.tar.gz
revert previous commit
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD18
2 files changed, 17 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0f8c00d7944d..83b95e3619ff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,12 @@
pkgbase = tutanota-desktop
pkgdesc = Official Tutanota email client
pkgver = 3.76.10
- pkgrel = 2
+ pkgrel = 3
url = https://tutanota.com
arch = x86_64
license = GPL3
makedepends = npm
+ makedepends = nvm
depends = nss
depends = libxss
depends = libxtst
diff --git a/PKGBUILD b/PKGBUILD
index 1a9eab6804bc..7b5644dd449a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,13 +3,13 @@
# Contributor: ganthern <https://github.com/ganthern>
pkgname=tutanota-desktop
pkgver=3.76.10
-pkgrel=2
+pkgrel=3
pkgdesc="Official Tutanota email client"
arch=('x86_64')
url="https://tutanota.com"
license=('GPL3')
depends=('nss' 'libxss' 'libxtst' 'libappindicator-gtk3' 'libnotify')
-makedepends=('npm')
+makedepends=('npm' 'nvm')
source=("https://github.com/tutao/tutanota/archive/tutanota-release-$pkgver.tar.gz"
"$pkgname"
"$pkgname.desktop")
@@ -18,9 +18,21 @@ sha256sums=('2d2ba3bb31048b0adae241fa4c07e2e52d486a40cc6326426009ebe6415d0a57'
'1215678e2fc23cfbeb73063f68dc440891e5b2e10734fa7f402e06860c292e31')
build() {
+ # Use nodejs v12 until upstream fixes build with v14
+ export npm_config_cache="$srcdir/npm-cache"
+ local npm_prefix=$(npm config get prefix)
+ local nodeversion='12.18.4'
+ npm config delete prefix
+ source /usr/share/nvm/init-nvm.sh
+ nvm install "$nodeversion" && nvm use "$nodeversion"
+
cd "${pkgname%-*}-${pkgname%-*}-release-$pkgver"
- npm install --cache "$srcdir/npm-cache"
+ npm install
node dist -l --custom-desktop-release --unpacked
+
+ # Restore node config from nvm
+ npm config set prefix "$npm_prefix"
+ nvm unalias default
}
package() {