From 7e04fb920b8ca2a6b96aaa4c635f5cb76c42711e Mon Sep 17 00:00:00 2001 From: cysamurai Date: Mon, 13 Apr 2026 15:37:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9E=84=E5=BB=BA=E8=84=9A?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/docker/install-build-deps.sh | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/scripts/docker/install-build-deps.sh b/scripts/docker/install-build-deps.sh index 7438332..0836775 100644 --- a/scripts/docker/install-build-deps.sh +++ b/scripts/docker/install-build-deps.sh @@ -44,13 +44,24 @@ apt-get install -y --no-install-recommends \ libayatana-appindicator3-dev librsvg2-dev libssl-dev # 交叉 arm64（勿装 systemd-sysv:arm64；用 --no-install-recommends） -apt-get install -y --no-install-recommends \ +if ! apt-get install -y --no-install-recommends \ + -o Dpkg::Options::="--force-overwrite" \ gcc-aarch64-linux-gnu \ libglib2.0-dev:arm64 libgtk-3-dev:arm64 \ libcairo2-dev:arm64 libpango1.0-dev:arm64 \ libgdk-pixbuf-2.0-dev:arm64 libatk1.0-dev:arm64 libepoxy-dev:arm64 \ libwebkit2gtk-4.1-dev:arm64 libjavascriptcoregtk-4.1-dev:arm64 \ - libssl-dev:arm64 libayatana-appindicator3-dev:arm64 librsvg2-dev:arm64 + libssl-dev:arm64 libayatana-appindicator3-dev:arm64 librsvg2-dev:arm64; then + apt-get -f install -y + apt-get install -y --no-install-recommends \ + -o Dpkg::Options::="--force-overwrite" \ + gcc-aarch64-linux-gnu \ + libglib2.0-dev:arm64 libgtk-3-dev:arm64 \ + libcairo2-dev:arm64 libpango1.0-dev:arm64 \ + libgdk-pixbuf-2.0-dev:arm64 libatk1.0-dev:arm64 libepoxy-dev:arm64 \ + libwebkit2gtk-4.1-dev:arm64 libjavascriptcoregtk-4.1-dev:arm64 \ + libssl-dev:arm64 libayatana-appindicator3-dev:arm64 librsvg2-dev:arm64 +fi # 为避免 NodeSource 在 multiarch 场景触发 python3 依赖解算冲突，直接使用 Ubuntu 官方 nodejs/npm。 apt-get install -y --no-install-recommends nodejs:amd64 npm:amd64