From 70354748e8fab608177fa489219b3a1bfc718b05 Mon Sep 17 00:00:00 2001 From: Kevin Yue Date: Sun, 22 Mar 2026 16:58:11 +0800 Subject: [PATCH] fix: continue deb build when mk-build-deps fails --- Makefile | 4 ++-- packaging/deb/rules.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e79213a..fcb4179 100644 --- a/Makefile +++ b/Makefile @@ -195,9 +195,9 @@ deb: init-debian cd .build/deb/$(PKG) && dch --create --distribution unstable --package $(PKG_NAME) --newversion $(VERSION)-$(REVISION) "Bugfix and improvements." # Install build dependencies - cd .build/deb/$(PKG) && sudo mk-build-deps --install --remove debian/control + cd .build/deb/$(PKG) && sudo mk-build-deps --install --remove debian/control || echo "mk-build-deps failed, continuing" - cd .build/deb/$(PKG) && debuild --preserve-env -e PATH -us -uc -b + cd .build/deb/$(PKG) && debuild --preserve-env -e PATH -us -uc -b -d check-ppa: if [ $(OFFLINE) -eq 0 ]; then \ diff --git a/packaging/deb/rules.in b/packaging/deb/rules.in index 930ebff..2b01ebb 100755 --- a/packaging/deb/rules.in +++ b/packaging/deb/rules.in @@ -3,7 +3,7 @@ export BUILD_GUI_HELPER = @BUILD_GUI_HELPER@ export DISABLE_RUST_TOOLCHAIN = 0 -export PATH := /usr/lib/rust-@RUST_VERSION@/bin:$(PATH) +export PATH := /usr/lib/rust-@RUST_VERSION@/bin:/usr/local/cargo/bin:$(PATH) %: which cargo