From 98e79f4f232387a4012c5a7fca659f6ca48732c3 Mon Sep 17 00:00:00 2001 From: Jackson Goode Date: Wed, 3 Jul 2024 18:24:10 -0700 Subject: [PATCH] Fix --- .github/workflows/build.yml | 5 +++-- psst-gui/Cargo.toml | 7 +++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4bb76024..d16b6e8c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -60,8 +60,7 @@ jobs: libgtk-3-dev \ libssl-dev \ libasound2-dev \ - gcc-aarch64-linux-gnu \ - g++-aarch64-linux-gnu \ + libglib2.0-dev \ pkg-config - name: Install cross @@ -82,9 +81,11 @@ jobs: - name: Build Release (Linux) if: runner.os == 'Linux' run: | + sudo apt-get install -y gcc-${{ matrix.arch }}-linux-gnu g++-${{ matrix.arch }}-linux-gnu cross build --target ${{ matrix.arch }}-unknown-linux-gnu --release env: PKG_CONFIG_ALLOW_CROSS: 1 + PKG_CONFIG_PATH: /usr/lib/${{ matrix.arch }}-linux-gnu/pkgconfig working-directory: ./psst-gui - name: Build Release (macOS) diff --git a/psst-gui/Cargo.toml b/psst-gui/Cargo.toml index 423a5e8f..5ff764ab 100644 --- a/psst-gui/Cargo.toml +++ b/psst-gui/Cargo.toml @@ -73,7 +73,8 @@ pre-build = [ """apt-get update && apt-get --assume-yes install \ libgtk-3-dev:$CROSS_DEB_ARCH \ libssl-dev:$CROSS_DEB_ARCH \ - libasound2-dev:$CROSS_DEB_ARCH + libasound2-dev:$CROSS_DEB_ARCH \ + libglib2.0-dev:$CROSS_DEB_ARCH """ ] @@ -83,10 +84,12 @@ pre-build = [ """apt-get update && apt-get --assume-yes install \ libgtk-3-dev:$CROSS_DEB_ARCH \ libssl-dev:$CROSS_DEB_ARCH \ - libasound2-dev:$CROSS_DEB_ARCH + libasound2-dev:$CROSS_DEB_ARCH \ + libglib2.0-dev:$CROSS_DEB_ARCH """ ] + [target.aarch64-unknown-linux-gnu.env] passthrough = [ "PKG_CONFIG_ALLOW_CROSS",