improve PKGBUILD

2 files changed, 23 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f95396db5954..5d270598a727 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,16 @@
-pkgbase = keyboard-configurator-git
+pkgbase = keyboard-configurator
 	pkgdesc = Configures keymap and backlight of System76 keyboards.
-	pkgver = 1.0.0
-	pkgrel = 2
+	pkgver = 1.1.0
+	pkgrel = 5
 	url = https://github.com/pop-os/keyboard-configurator
 	arch = x86_64
 	license = GPL3
+	makedepends = cargo
+	makedepends = systemd
 	depends = gtk3
-	depends = rust
-	depends = systemd
-
-pkgname = keyboard-configurator-git
+	depends = hidapi
+	depends = xz
+	source = keyboard-configurator::git+https://github.com/pop-os/keyboard-configurator
+	sha256sums = SKIP
 
+pkgname = keyboard-configurator
diff --git a/PKGBUILD b/PKGBUILD
index 0dfdbc3f832f..c8a23e8c1eb2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,29 @@
 # Maintainer: Aaron Honeycutt <aaron at system76 dot com>
 pkgname=keyboard-configurator
-pkgver=1.0.0
-pkgrel=2
+pkgver=1.1.0
+pkgrel=5
 pkgdesc="Configures keymap and backlight of System76 keyboards."
 arch=('x86_64')
 url="https://github.com/pop-os/keyboard-configurator"
 license=('GPL3')
-makedepends=('gtk3' 'rust' 'systemd' 'git')
+depends=('gtk3' 'hidapi' 'xz')
+makedepends=('cargo' 'systemd')
 source=("${pkgname}::git+${url}")
 sha256sums=('SKIP')
 
+prepare() {
+	cd "$pkgname"
+	export RUSTUP_TOOLCHAIN=stable
+	cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
+}
+
 build() {
-	cd "$pkgbase"
+	cd "$pkgname"
+	export RUSTUP_TOOLCHAIN=stable
 	make prefix=/usr
 }
 
 package() {
-	depends=('xz' 'hidapi' 'gtk3')
-	cd "$pkgbase"
+	cd "$pkgname"
 	make prefix=/usr DESTDIR="$pkgdir/" install
 }
-