summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCsonka Mihaly2020-02-04 18:35:33 +0100
committerCsonka Mihaly2020-02-04 18:35:33 +0100
commit4e3171dc300f5aa217792940d3c708c38ab68eb6 (patch)
tree14e4370372c6397d66f11265e9847fbe9a11c2a1
parent82ed32113c06ef063cc0ea6a4be8ddfcd7edfc41 (diff)
downloadaur-4e3171dc300f5aa217792940d3c708c38ab68eb6.tar.gz
Fix build step according to upstream changes
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD16
2 files changed, 7 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 463fa7096d2..473d62bd680 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,12 @@
pkgbase = rust-analyzer-vscode-git
pkgdesc = An experimental Rust compiler front-end for IDEs (VSCode installation).
- pkgver = r5799.0e61ba37
+ pkgver = r7300.c9e1aab88
pkgrel = 1
url = https://github.com/rust-analyzer/rust-analyzer/
arch = any
license = MIT
makedepends = git
- makedepends = npm
+ makedepends = npm>=6.10.0
depends = rustup
depends = code
provides = rust-analyzer-vscode-git
diff --git a/PKGBUILD b/PKGBUILD
index 20b2a16d1d2..c9689b6540e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
# Maintainer: Kibouo <csonka.mihaly@hotmail.com>
pkgname=rust-analyzer-vscode-git
-pkgver=r5799.0e61ba37
+pkgver=r7300.c9e1aab88
pkgrel=1
pkgdesc='An experimental Rust compiler front-end for IDEs (VSCode installation).'
arch=('any')
url='https://github.com/rust-analyzer/rust-analyzer/'
license=('MIT')
depends=('rustup' 'code')
-makedepends=('git' 'npm')
+makedepends=('git' 'npm>=6.10.0')
provides=("${pkgname}")
conflicts=("${pkgname}" 'rust-analyzer-git')
source=("${pkgname}::git+${url}")
@@ -19,19 +19,13 @@ pkgver() {
build() {
cd $pkgname
+ rustup update
rustup install stable
cargo +stable build --release
-
- cd ./editors/code
- npm install
+ rustup component add rust-src
}
package() {
cd $pkgname
- install -D -m755 "$srcdir/$pkgname/target/release/ra_lsp_server" "$pkgdir/usr/bin/ra_lsp_server"
- install -D -m755 "$srcdir/$pkgname/target/release/ra_cli" "$pkgdir/usr/bin/ra_cli"
-
- cd ./editors/code
- ./node_modules/vsce/out/vsce package
- code --install-extension ./ra-lsp-0.0.1.vsix
+ cargo xtask install
}