From 5151f999020ad64cc74eb9a3fa93a771627c6c66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Andr=C3=A9?= Date: Sat, 6 Jul 2024 13:32:22 +0200 Subject: [PATCH] fix: set dbus to vendored for aarch64 (#118) * chore: set dbus as vendored for future arm64 builds Signed-off-by: Martichou * chore: arm64 cross pre-build Signed-off-by: Martichou --------- Signed-off-by: Martichou --- app/legacy/src-tauri/Cargo.lock | 2 ++ core_lib/Cargo.lock | 2 ++ core_lib/Cargo.toml | 3 +++ core_lib/Cross.toml | 4 ++++ 4 files changed, 11 insertions(+) create mode 100644 core_lib/Cross.toml diff --git a/app/legacy/src-tauri/Cargo.lock b/app/legacy/src-tauri/Cargo.lock index 1092f68..9ce3792 100644 --- a/app/legacy/src-tauri/Cargo.lock +++ b/app/legacy/src-tauri/Cargo.lock @@ -2633,6 +2633,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" dependencies = [ + "cc", "pkg-config", ] @@ -4114,6 +4115,7 @@ dependencies = [ "bluer", "btleplug", "bytes", + "dbus", "directories", "futures", "get_if_addrs", diff --git a/core_lib/Cargo.lock b/core_lib/Cargo.lock index 9474c78..9eee5f2 100644 --- a/core_lib/Cargo.lock +++ b/core_lib/Cargo.lock @@ -1187,6 +1187,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" dependencies = [ + "cc", "pkg-config", ] @@ -1888,6 +1889,7 @@ dependencies = [ "bluer", "btleplug", "bytes", + "dbus", "directories", "futures", "get_if_addrs", diff --git a/core_lib/Cargo.toml b/core_lib/Cargo.toml index 1314a64..5e0aa45 100644 --- a/core_lib/Cargo.toml +++ b/core_lib/Cargo.toml @@ -12,6 +12,9 @@ path = "src/bin.rs" [target.'cfg(target_os = "linux")'.dependencies] bluer = { version = "0.17", features = ["full"], optional = true } +[target.'cfg(all(target_arch = "aarch64", target_os = "linux"))'.dependencies] +dbus = { version = "0.9", features = ["vendored"] } + [dependencies] anyhow = "1.0" arboard = "3.3" diff --git a/core_lib/Cross.toml b/core_lib/Cross.toml new file mode 100644 index 0000000..6b7bb73 --- /dev/null +++ b/core_lib/Cross.toml @@ -0,0 +1,4 @@ +[target.aarch64-unknown-linux-gnu] +pre-build = [ + "apt update && apt install -y libprotobuf-dev protobuf-compiler", +] \ No newline at end of file