summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMckol2018-09-23 05:00:25 +0200
committerMckol2018-09-23 05:00:52 +0200
commit376a5ac728dfb2c4452fd8362ded43e5fe776598 (patch)
tree392d9b19f9c43a0fa2a98c4cb3e333f93a3a38c8
parent503fea8b62cb8c8b8eac17ea8622efea6be2adc4 (diff)
downloadaur-376a5ac728dfb2c4452fd8362ded43e5fe776598.tar.gz
Set default rust toolchain to nightly automatically
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD4
2 files changed, 3 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 28cb7faf901..5f2a742c1c6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,8 +7,7 @@ pkgbase = veloren-git
arch = i686
license = GPL3
makedepends = git
- makedepends = rust-nightly
- makedepends = cargo-nightly
+ makedepends = rustup
depends = bash
provides = veloren-git
conflicts = veloren-git
diff --git a/PKGBUILD b/PKGBUILD
index bbe6b005d6e..cc680378533 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,8 +10,7 @@ license=('GPL3')
depends=('bash')
makedepends=(
'git'
- 'rust-nightly'
- 'cargo-nightly'
+ 'rustup'
)
provides=("$pkgname")
conflicts=("$pkgname")
@@ -36,6 +35,7 @@ prepare() {
}
build() {
+ rustup default nightly
cd "$srcdir/$pkgname/voxygen"
cargo build --release
cd "$srcdir/$pkgname/server-cli"