PKGBUILD improvements

2 files changed, 14 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1ee1ae5395eb..4000030abc0c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -6,8 +6,8 @@ pkgbase = pop-shell-shortcuts-git
 	url = https://github.com/pop-os/shell-shortcuts
 	arch = x86_64
 	license = GPL3
+	makedepends = cargo
 	makedepends = git
-	makedepends = rust
 	depends = gtk3
 	provides = pop-shell-shortcuts
 	conflicts = pop-shell-shortcuts
@@ -15,4 +15,3 @@ pkgbase = pop-shell-shortcuts-git
 	sha256sums = SKIP
 
 pkgname = pop-shell-shortcuts-git
-
diff --git a/PKGBUILD b/PKGBUILD
index a967f20e858f..ed8540961c64 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,24 +9,30 @@ arch=('x86_64')
 url="https://github.com/pop-os/shell-shortcuts"
 license=('GPL3')
 depends=('gtk3')
-makedepends=('git' 'rust')
+makedepends=('cargo' 'git')
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
 source=('git+https://github.com/pop-os/shell-shortcuts.git')
 sha256sums=('SKIP')
 
 pkgver() {
-    cd "$srcdir/shell-shortcuts"
-    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd "$srcdir/shell-shortcuts"
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+
+prepare() {
+  cd "$srcdir/shell-shortcuts"
+  cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
 }
 
 build() {
-    cd "$srcdir/shell-shortcuts"
-    make prefix=/usr
+  cd "$srcdir/shell-shortcuts"
+  export RUSTUP_TOOLCHAIN=stable
+  make prefix=/usr
 }
 
 package() {
-    cd "$srcdir/shell-shortcuts"
-    make prefix=/usr DESTDIR="$pkgdir" install
+  cd "$srcdir/shell-shortcuts"
+  make prefix=/usr DESTDIR="$pkgdir" install
 }