From 411c0d0b64c160c4b410e73fdbe6244bc2329dc6 Mon Sep 17 00:00:00 2001
From: Jackson Goode <jacksongoode@proton.me>
Date: Sat, 6 Jul 2024 13:39:32 -0700
Subject: [PATCH] Try?

---
 Cargo.toml           | 14 ++++++++++++++
 psst-core/Cargo.toml | 27 +--------------------------
 psst-gui/Cargo.toml  | 28 ++++++++++++----------------
 3 files changed, 27 insertions(+), 42 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 235f3777..65bec87f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,3 +13,17 @@ opt-level = 2
 
 [profile.dev.package.libsamplerate]
 opt-level = 2
+
+[target.aarch64-unknown-linux-gnu]
+image = "ghcr.io/cross-rs/aarch64-unknown-linux-gnu:edge"
+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"
+]
+
+[target.x86_64-unknown-linux-gnu]
+image = "ghcr.io/cross-rs/x86_64-unknown-linux-gnu:edge"
+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"
+]
\ No newline at end of file
diff --git a/psst-core/Cargo.toml b/psst-core/Cargo.toml
index efdda8d4..15e1db87 100644
--- a/psst-core/Cargo.toml
+++ b/psst-core/Cargo.toml
@@ -47,29 +47,4 @@ rb = { version = "0.4.1" }
 symphonia = { version = "0.5.3", default-features = false, features = ["ogg", "vorbis", "mp3"]}
 
 [target.'cfg(target_os = "windows")'.dependencies]
-windows = { version = "0.51.1", features = ["Win32_System_Com"], default-features = false }
-
-
-[package.metadata.cross.target.x86_64-unknown-linux-gnu]
-image = "ghcr.io/cross-rs/x86_64-unknown-linux-gnu:edge"
-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
-    """
-]
-
-[package.metadata.cross.target.aarch64-unknown-linux-gnu]
-image = "ghcr.io/cross-rs/aarch64-unknown-linux-gnu:edge"
-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
-    """
-]
\ No newline at end of file
+windows = { version = "0.51.1", features = ["Win32_System_Com"], default-features = false }
\ No newline at end of file
diff --git a/psst-gui/Cargo.toml b/psst-gui/Cargo.toml
index 6665fa70..40e2d814 100644
--- a/psst-gui/Cargo.toml
+++ b/psst-gui/Cargo.toml
@@ -75,20 +75,16 @@ long_description = """
 Small and efficient graphical music player for Spotify network.
 """
 
-[package.metadata.cross.target.x86_64-unknown-linux-gnu]
-image = "ghcr.io/cross-rs/{{TARGET}}:edge"
-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
-    """]
+[target.aarch64-unknown-linux-gnu]
+image = "ghcr.io/cross-rs/aarch64-unknown-linux-gnu:edge"
+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"
+]
 
-[package.metadata.cross.target.aarch64-unknown-linux-gnu]
-image = "ghcr.io/cross-rs/{{TARGET}}:edge"
-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
-    """]
+[target.x86_64-unknown-linux-gnu]
+image = "ghcr.io/cross-rs/x86_64-unknown-linux-gnu:edge"
+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"
+]
\ No newline at end of file