Skip to content

Commit f8c8531

Browse files
committed
chore: use resolver v3 for correct bindgen feature
1 parent 5f38925 commit f8c8531

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

.github/workflows/cd.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ jobs:
7070
run: |
7171
sudo apt-get update
7272
# alsa_backend,rodio_backend and base deps
73-
sudo apt-get install -y libasound2-dev libssl-dev libclang-dev clang
73+
sudo apt-get install -y libasound2-dev libssl-dev
74+
# potentially install bindgen dependencies
75+
sudo apt-get install -y libclang-dev cmake
7476
# dbus_mpris
7577
sudo apt-get install -y libdbus-1-dev
7678
# pulseaudio_backend

Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ description = "A Spotify daemon"
66
repository = "https://github.com/Spotifyd/spotifyd"
77
license = "GPL-3.0-only"
88
version = "0.4.0"
9+
resolver = "3"
910
rust-version = "1.82"
1011

1112
[dependencies]
@@ -51,7 +52,7 @@ whoami = "1"
5152
[target."cfg(target_os = \"openbsd\")".dependencies]
5253
pledge = "0.4.2"
5354

54-
[target.armv7-unknown-linux-gnueabihf.dependencies]
55+
[target."cfg(not(any(target_arch = \"aarch64\", target_arch = \"x86_64\")))".dependencies]
5556
aws-lc-rs = { version = "1.12.5", features = ["bindgen"] }
5657

5758
[dev-dependencies]

Cross.toml

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
pre-build = [
33
"dpkg --add-architecture $CROSS_DEB_ARCH",
44
"apt-get update",
5+
# bindgen requirements
6+
"apt-get install -y libclang-dev cmake",
57
# alsa_backend,rodio_backend and base requirements
6-
"apt-get install -y libasound2-dev:$CROSS_DEB_ARCH libssl-dev:$CROSS_DEB_ARCH libclang-10-dev clang-10",
8+
"apt-get install -y libasound2-dev:$CROSS_DEB_ARCH libssl-dev:$CROSS_DEB_ARCH",
79
# dbus_mpris
810
"apt-get install -y libdbus-1-dev:$CROSS_DEB_ARCH",
911
# pulseaudio_backend

0 commit comments

Comments
 (0)