From bb9cf74395db8831449c91a557df4f236169af2d Mon Sep 17 00:00:00 2001 From: Jackson Goode Date: Wed, 3 Jul 2024 15:11:41 -0700 Subject: [PATCH] Fix? --- .github/workflows/build.yml | 5 ----- Cargo.toml | 16 +++++++++++++++- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1df3e47c..3b339db0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -52,11 +52,6 @@ jobs: run: cargo test continue-on-error: true - - name: Install Linux Dependencies - if: runner.os == 'Linux' - run: | - sudo apt-get update && sudo apt-get install -y libgtk-3-dev libssl-dev libasound2-dev libglib2.0-dev - - name: Build Release (Linux) if: runner.os == 'Linux' uses: houseabsolute/actions-rust-cross@v0 diff --git a/Cargo.toml b/Cargo.toml index ce21b6dc..86a66564 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,8 +18,22 @@ opt-level = 2 [profile.dev.package.libsamplerate] opt-level = 2 +[workspace.metadata.cross.target.x86_64-unknown-linux-gnu] +pre-build = [ + "dpkg --add-architecture $CROSS_DEB_ARCH", + """apt-get update && apt-get --assume-yes install \ + libgtk-3-dev:$CROSS_DEB_ARCH \ + libssl-dev:$CROSS_DEB_ARCH \ + libasound2-dev:$CROSS_DEB_ARCH + """ +] + [workspace.metadata.cross.target.aarch64-unknown-linux-gnu] pre-build = [ "dpkg --add-architecture $CROSS_DEB_ARCH", - "apt-get update && apt-get --assume-yes install libglib2.0-dev:$CROSS_DEB_ARCH" + """apt-get update && apt-get --assume-yes install \ + libgtk-3-dev:$CROSS_DEB_ARCH \ + libssl-dev:$CROSS_DEB_ARCH \ + libasound2-dev:$CROSS_DEB_ARCH + """ ]