saltyming/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-08-28 21:44:49 +00:00
Code Activity

Fix debian docker building (#5752)

Browse source 
In previous attempts to get mysqlclient-sys to build and work I added some extra build variables.
These are not needed if you configure pkg-config correctly.
The same goes for OpenSSL btw.

This PR configures the pkg-config in the right way and allows the crates to build using the right lib paths automatically.
Because of this change also the lib/include paths were not needed anymore for some architectures, except for i386.

Also updated crates again.

Signed-off-by: BlackDex <black.dex@gmail.com>
This commit is contained in:
Mathijs van Veluw 2025-04-05 17:58:32 +02:00 • committed by GitHub
commit 025bb90f8f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 30 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Cargo.toml
View file

@ -18,7 +18,7 @@ build = "build.rs"
# default = ["sqlite"]
# Empty to keep compatibility, prefer to set USE_SYSLOG=true
enable_syslog = []
mysql = ["diesel/mysql", "diesel_migrations/mysql", "dep:mysqlclient-sys"]
mysql = ["diesel/mysql", "diesel_migrations/mysql"]
postgresql = ["diesel/postgres", "diesel_migrations/postgres"]
sqlite = ["diesel/sqlite", "diesel_migrations/sqlite", "dep:libsqlite3-sys"]
# Enable to use a vendored and statically linked openssl
@ -87,8 +87,6 @@ diesel-derive-newtype = "2.1.2"
# Bundled/Static SQLite
libsqlite3-sys = { version = "0.32.0", features = ["bundled"], optional = true }
# Always enable buildtime bindgen for mysql/mariadb libraries
mysqlclient-sys = { version = "0.4.4", features = ["buildtime_bindgen"], optional = true }
# Crypto-related libraries
rand = "0.9.0"