Modify dependencies
- Add 'git' to makedepends as its required during build - 'npm' is a makedepend to prevent yarn from arbitrarily changing the working directory and causing build failures by being unable to find '.yarnclean'. See https://github.com/tootsuite/mastodon/issues/6809 - Change 'yarn' to be a full dependency so database migrations and asset precompilations don't fail
This commit is contained in:
parent
e3b2033d67
commit
114216e80a
2 changed files with 10 additions and 7 deletions
8
.SRCINFO
8
.SRCINFO
|
@ -1,15 +1,16 @@
|
|||
# Generated by mksrcinfo v8
|
||||
# Mon Aug 27 17:14:57 UTC 2018
|
||||
# Wed Aug 29 20:53:07 UTC 2018
|
||||
pkgbase = mastodon
|
||||
pkgdesc = Free software social-network server based on ActivityPub and OStatus
|
||||
pkgver = 2.4.5
|
||||
pkgrel = 1
|
||||
pkgrel = 2
|
||||
url = https://joinmastodon.org
|
||||
install = mastodon.install
|
||||
arch = i686
|
||||
arch = x86_64
|
||||
license = AGPL3
|
||||
makedepends = yarn
|
||||
makedepends = git
|
||||
makedepends = npm
|
||||
makedepends = python2
|
||||
depends = ffmpeg
|
||||
depends = imagemagick
|
||||
|
@ -21,6 +22,7 @@ pkgbase = mastodon
|
|||
depends = redis
|
||||
depends = ruby-bundler
|
||||
depends = protobuf
|
||||
depends = yarn
|
||||
conflicts = mastodon-git
|
||||
backup = etc/mastodon/environment
|
||||
source = https://github.com/tootsuite/mastodon/archive/v2.4.5.tar.gz
|
||||
|
|
9
PKGBUILD
9
PKGBUILD
|
@ -2,7 +2,7 @@
|
|||
|
||||
pkgname=mastodon
|
||||
pkgver=2.4.5
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc='Free software social-network server based on ActivityPub and OStatus'
|
||||
arch=(i686 x86_64)
|
||||
url=https://joinmastodon.org
|
||||
|
@ -16,8 +16,9 @@ depends=(ffmpeg
|
|||
postgresql
|
||||
redis
|
||||
ruby-bundler
|
||||
protobuf)
|
||||
makedepends=(yarn python2)
|
||||
protobuf
|
||||
yarn)
|
||||
makedepends=(git npm python2)
|
||||
conflicts=(mastodon-git)
|
||||
backup=(etc/mastodon/environment)
|
||||
install=mastodon.install
|
||||
|
@ -39,7 +40,7 @@ build() {
|
|||
}
|
||||
|
||||
package() {
|
||||
install -d "$pkgdir"{/var/lib,/etc/mastodon}
|
||||
install -d "$pkgdir"/{var/lib,etc/mastodon}
|
||||
cp -a mastodon-$pkgver "$pkgdir"/var/lib/mastodon
|
||||
ln -s /etc/mastodon/environment "$pkgdir"/var/lib/mastodon/.env
|
||||
touch "$pkgdir"/etc/mastodon/environment
|
||||
|
|
Loading…
Reference in a new issue