summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSainnhe Park2021-03-28 10:49:04 +0800
committerSainnhe Park2021-03-28 10:49:04 +0800
commitdf1aeeed742c6791968f4772fc734f0c63e2a7be (patch)
tree242e05c305ef0ab38bc5f5f072404a1670d6e45b
parent263d50a8b8d7d81985d7715f42d611e977836b9c (diff)
downloadaur-df1aeeed742c6791968f4772fc734f0c63e2a7be.tar.gz
Add ra as depends
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD11
-rw-r--r--package.json.patch11
3 files changed, 22 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5a72ff8ffe08..ad045890d0ef 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = vim-coc-rust-analyzer-git
pkgdesc = rust-analyzer extension for coc.nvim
- pkgver = r464.4b3847f
+ pkgver = r865.8eba9cf
pkgrel = 1
url = https://github.com/fannheyward/coc-rust-analyzer
arch = any
@@ -8,10 +8,13 @@ pkgbase = vim-coc-rust-analyzer-git
makedepends = yarn
makedepends = git
depends = vim-coc
+ depends = rust-analyzer
provides = vim-coc-rust-analyzer
conflicts = vim-coc-rust-analyzer
source = coc-rust-analyzer::git+https://github.com/fannheyward/coc-rust-analyzer.git
+ source = package.json.patch
sha256sums = SKIP
+ sha256sums = 3f5fdb4c82e98bff76a2241ae21d9a9da4b146f5bcd6a5cf110a8953260dc098
pkgname = vim-coc-rust-analyzer-git
diff --git a/PKGBUILD b/PKGBUILD
index 299f796ee6f6..4a11ed890004 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,13 +9,15 @@ pkgname="${_variant}-${_extname}-git"
provides=("${_variant}-${_extname}")
conflicts=("${_variant}-${_extname}")
arch=('any')
-depends=("${_variant}-coc")
+depends=("${_variant}-coc" 'rust-analyzer')
makedepends=('yarn' 'git')
license=('MIT')
-source=("${_extname}::git+${url}.git")
-pkgver=r464.4b3847f
+source=("${_extname}::git+${url}.git"
+ 'package.json.patch')
+pkgver=r865.8eba9cf
pkgrel=1
-sha256sums=('SKIP')
+sha256sums=('SKIP'
+ '3f5fdb4c82e98bff76a2241ae21d9a9da4b146f5bcd6a5cf110a8953260dc098')
pkgver() {
cd "${srcdir}/${_extname}"
@@ -39,5 +41,6 @@ package() {
install -Dm 644 '{}' "${pkgdir}/${_packdir}/{}" \;
rm -rf "${srcdir}/${_extname}/package"
find "$pkgdir" -name package.json -print0 | xargs -r -0 sed -i '/_where/d'
+ patch "$pkgdir/$_packdir/package.json" <"$srcdir/package.json.patch"
chown -R root:root "${pkgdir}"
}
diff --git a/package.json.patch b/package.json.patch
new file mode 100644
index 000000000000..2e965d67ed0f
--- /dev/null
+++ b/package.json.patch
@@ -0,0 +1,11 @@
+--- package.json.old 2021-03-28 10:43:05.597743453 +0800
++++ package.json.new 2021-03-28 10:44:14.837746213 +0800
+@@ -119,7 +119,7 @@
+ "null",
+ "string"
+ ],
+- "default": null,
++ "default": "/usr/bin/rust-analyzer",
+ "description": "Path to rust-analyzer executable (points to bundled binary by default). If this is set, then \"rust-analyzer.updates.channel\" setting is not used"
+ },
+ "rust-analyzer.server.extraEnv": {