PKGBUILD improvements

2 files changed, 12 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5be3966d873c..430e7a1bd430 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -5,7 +5,7 @@ pkgbase = system76-oled
 	url = https://github.com/pop-os/system76-oled
 	arch = x86_64
 	license = GPL3
-	makedepends = rust
+	makedepends = cargo
 	depends = dbus
 	depends = libx11
 	depends = libxrandr
@@ -13,4 +13,3 @@ pkgbase = system76-oled
 	sha256sums = 14bd774108a91780af1cb85bc15089d28d8bd8c3dbe5c6d2eba1b41791ce1f16
 
 pkgname = system76-oled
-
diff --git a/PKGBUILD b/PKGBUILD
index 99ecd36f9553..30f9284217ae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,17 +8,23 @@ arch=('x86_64')
 url="https://github.com/pop-os/system76-oled"
 license=('GPL3')
 depends=('dbus' 'libx11' 'libxrandr')
-makedepends=('rust')
+makedepends=('cargo')
 source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz")
 sha256sums=('14bd774108a91780af1cb85bc15089d28d8bd8c3dbe5c6d2eba1b41791ce1f16')
 
+prepare() {
+  cd "$pkgname-$pkgver"
+  cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
+}
+
 build() {
-	cd "$pkgname-$pkgver"
-	make
+  cd "$pkgname-$pkgver"
+  export RUSTUP_TOOLCHAIN=stable
+  make
 }
 
 package() {
-	cd "$pkgname-$pkgver"
-	make DESTDIR="$pkgdir/" install
+  cd "$pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" install
 }