chore: 更新依赖

idootop · Mar 20, 2024 · f909680 · f909680
1 parent 6caab6f
commit f909680
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/.github/workflows/desktop.yaml b/.github/workflows/desktop.yaml
@@ -227,6 +227,7 @@ jobs:
         with:
           workspaces: "packages/feiyu-desktop/src-tauri/${{ matrix.target }} -> target"
       - name: 初始化 apt sources.list
+        if: matrix.arch != 'x86_64'
         run: |
           cat > /tmp/sources.list << EOF
           deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu jammy main multiverse universe restricted
@@ -258,32 +259,32 @@ jobs:
           elif [ "${{ matrix.target }}" = "i686-unknown-linux-gnu" ]; then
               sudo dpkg --add-architecture i386
               sudo apt-get update
-              sudo apt install -y libstdc++6:i386 libgdk-pixbuf2.0-dev:i386 libatomic1:i386 gcc-multilib g++-multilib libssl-dev:i386 \
-                  libwebkit2gtk-4.0-dev:i386 libgtk-3-dev:i386 patchelf:i386 librsvg2-dev:i386 libayatana-appindicator3-dev:i386
+              sudo apt install -y gcc-multilib g++-multilib libssl-dev:i386 \
+                  libwebkit2gtk-4.0-dev:i386 libgtk-3-dev:i386 librsvg2-dev:i386
               export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig/:$PKG_CONFIG_PATH
               export PKG_CONFIG_SYSROOT_DIR=/
           elif [ "${{ matrix.target }}" = "aarch64-unknown-linux-gnu" ]; then
               sudo dpkg --add-architecture arm64
               sudo apt-get update
-              sudo apt install -y libncurses6:arm64 libtinfo6:arm64 linux-libc-dev:arm64 libncursesw6:arm64 libcups2:arm64
-              sudo apt install -y --no-install-recommends g++-aarch64-linux-gnu libc6-dev-arm64-cross libssl-dev:arm64 \
+              sudo apt install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu libc6-dev-arm64-cross libssl-dev:arm64 \
                   libwebkit2gtk-4.0-dev:arm64 libgtk-3-dev:arm64 patchelf:arm64 librsvg2-dev:arm64 libayatana-appindicator3-dev:arm64
               export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc
               export CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc
               export CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++
               export PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig
               export PKG_CONFIG_ALLOW_CROSS=1
+              export PKG_CONFIG_SYSROOT_DIR=/usr/aarch64-linux-gnu/
           elif [ "${{ matrix.target }}" = "armv7-unknown-linux-gnueabihf" ]; then
               sudo dpkg --add-architecture armhf
               sudo apt-get update
-              sudo apt install -y libncurses6:armhf libtinfo6:armhf linux-libc-dev:armhf libncursesw6:armhf libcups2:armhf
-              sudo apt install -y --no-install-recommends g++-arm-linux-gnueabihf libc6-dev-armhf-cross libssl-dev:armhf \
+              sudo apt install -y gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf libc6-dev-armhf-cross libssl-dev:armhf \
                   libwebkit2gtk-4.0-dev:armhf libgtk-3-dev:armhf patchelf:armhf librsvg2-dev:armhf libayatana-appindicator3-dev:armhf
               export CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc
               export CC_armv7_unknown_linux_gnueabihf=arm-linux-gnueabihf-gcc
               export CXX_armv7_unknown_linux_gnueabihf=arm-linux-gnueabihf-g++
               export PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/pkgconfig
               export PKG_CONFIG_ALLOW_CROSS=1
+              export PKG_CONFIG_SYSROOT_DIR=/usr/arm-linux-gnueabihf/
           fi
       - name: 构建飞鱼 APP
         id: app