Added missing python2 makedepends to ferdi and removed unnecessary env vars

2 files changed, 10 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b4a018e63b55..d171d07a7a3c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ferdi
 	pkgdesc = A messaging browser that allows you to combine your favorite messaging services into one application
 	pkgver = 5.5.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://getferdi.com
 	arch = x86_64
 	arch = i686
@@ -11,11 +11,12 @@ pkgbase = ferdi
 	makedepends = git
 	makedepends = npm
 	makedepends = python
+	makedepends = python2
 	depends = electron
 	depends = libxkbfile
-	source = ferdi-5.5.0-2.tar.gz::https://github.com/getferdi/ferdi/archive/v5.5.0.tar.gz
-	source = ferdi-5.5.0-2-recipes.tar.gz::https://github.com/getferdi/recipes/archive/3054fd4c362b5be81b5cdd48535a0e7078fcd0a6.tar.gz
-	source = ferdi-5.5.0-2-internal-server.tar.gz::https://github.com/getferdi/internal-server/archive/95ae59926dbd88d55a5377be997558a9e112ab49.tar.gz
+	source = ferdi-5.5.0-3.tar.gz::https://github.com/getferdi/ferdi/archive/v5.5.0.tar.gz
+	source = ferdi-5.5.0-3-recipes.tar.gz::https://github.com/getferdi/recipes/archive/3054fd4c362b5be81b5cdd48535a0e7078fcd0a6.tar.gz
+	source = ferdi-5.5.0-3-internal-server.tar.gz::https://github.com/getferdi/internal-server/archive/95ae59926dbd88d55a5377be997558a9e112ab49.tar.gz
 	source = fix-autostart-path.diff
 	sha256sums = 319b02b565e34720c8ccefdb08cfe37219304c002e469fdf1a15c8971b573fc3
 	sha256sums = b72d06155d20292d90c5b9fc05f83b318080abf858669ca2c1a2a539890c3427
diff --git a/PKGBUILD b/PKGBUILD
index c0e3ff01f7f3..e09c8c1dc498 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,13 +7,13 @@ pkgname='ferdi'
 pkgver='5.5.0'
 _recipescommit='3054fd4c362b5be81b5cdd48535a0e7078fcd0a6'
 _internalservercommit='95ae59926dbd88d55a5377be997558a9e112ab49'
-pkgrel='2'
+pkgrel='3'
 pkgdesc='A messaging browser that allows you to combine your favorite messaging services into one application'
 arch=('x86_64' 'i686' 'armv7h' 'aarch64')
 url="https://get$pkgname.com"
 license=('Apache')
 depends=('electron' 'libxkbfile')
-makedepends=('git' 'npm' 'python')
+makedepends=('git' 'npm' 'python' 'python2')
 source=(
 	"$pkgname-$pkgver-$pkgrel.tar.gz::https://github.com/get$pkgname/$pkgname/archive/v$pkgver.tar.gz"
 	"$pkgname-$pkgver-$pkgrel-recipes.tar.gz::https://github.com/get$pkgname/recipes/archive/$_recipescommit.tar.gz"
@@ -49,13 +49,7 @@ prepare() {
 	patch --forward -p1 < '../fix-autostart-path.diff'
 
 	# Prepare dependencies
-	export HOME="$srcdir/$pkgname-$pkgver-$pkgrel-home"
-	export XDG_CACHE_HOME="$srcdir/$pkgname-$pkgver-$pkgrel-cache"
-	export npm_config_devdir="$srcdir/$pkgname-$pkgver-$pkgrel-npm-dev"
-	export npm_config_cache="$srcdir/$pkgname-$pkgver-$pkgrel-npm-cache"
-	# export NODE_GYP_FORCE_PYTHON='/usr/bin/python' - when https://github.com/sass/node-sass/issues/2877 is fixed
-
-	npx lerna bootstrap
+	HOME="$srcdir/$pkgname-$pkgver-$pkgrel-home" npx lerna bootstrap
 }
 
 build() {
@@ -76,14 +70,8 @@ build() {
 		;;
 	esac
 
-	export NODE_ENV='production'
-	export HOME="$srcdir/$pkgname-$pkgver-$pkgrel-home"
-	export XDG_CACHE_HOME="$srcdir/$pkgname-$pkgver-$pkgrel-cache"
-	export npm_config_devdir="$srcdir/$pkgname-$pkgver-$pkgrel-npm-dev"
-	export npm_config_cache="$srcdir/$pkgname-$pkgver-$pkgrel-npm-cache"
-
-	npx gulp build
-	npx electron-builder --linux dir "--$_electronbuilderarch" -c.electronDist='/usr/lib/electron' -c.electronVersion="$(cat '/usr/lib/electron/version')"
+	NODE_ENV='production' HOME="$srcdir/$pkgname-$pkgver-$pkgrel-home" npx gulp build
+	NODE_ENV='production' HOME="$srcdir/$pkgname-$pkgver-$pkgrel-home" npx electron-builder --linux dir "--$_electronbuilderarch" -c.electronDist='/usr/lib/electron' -c.electronVersion="$(cat '/usr/lib/electron/version')"
 }
 
 package() {