Fix?

jpochyla · Jul 3, 2024 · bb9cf74 · bb9cf74
1 parent 68b53c0
commit bb9cf74
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git 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
@@ -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
+    """
 ]