Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ENG-1325] Vendor openssl in tauri #1636

Merged
merged 3 commits into from
Oct 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .cargo/config.toml.mustache
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
[env]
{{#protoc}}
PROTOC = "{{{protoc}}}"
PROTOC = { force = true, value = "{{{protoc}}}" }
{{/protoc}}
{{^isLinux}}
FFMPEG_DIR = "{{{nativeDeps}}}"
FFMPEG_DIR = { force = true, value = "{{{nativeDeps}}}" }
{{/isLinux}}
OPENSSL_STATIC = { force = true, value = "1" }
OPENSSL_NO_VENDOR = { force = true, value = "0" }
OPENSSL_RUST_USE_NASM = { force = true, value = "1" }

{{#isMacOS}}
[target.x86_64-apple-darwin]
Expand Down
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ tracing-subscriber = { git = "https://github.com/tokio-rs/tracing", rev = "29146
tracing-appender = { git = "https://github.com/tokio-rs/tracing", rev = "29146260fb4615d271d2e899ad95a753bb42915e" } # Unreleased changes for rolling log deletion

rspc = { version = "0.1.4" }
specta = { version = "1.0.4" }
specta = { version = "1.0.5" }
tauri-specta = { version = "1.0.2" }

swift-rs = { version = "1.0.6" }
Expand Down
1 change: 1 addition & 0 deletions apps/desktop/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ tauri = { version = "1.5.2", features = [
"shell-all",
"updater",
"window-all",
"native-tls-vendored"
] }

rspc = { workspace = true, features = ["tauri"] }
Expand Down
6 changes: 0 additions & 6 deletions apps/mobile/modules/sd-core/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@ sd-core = { path = "../../../../../core", features = [
rspc = { workspace = true }
serde_json = { workspace = true }
tokio = { workspace = true }
openssl = { version = "0.10.57", features = [
"vendored",
] } # Override features of transitive dependencies
openssl-sys = { version = "0.9.93", features = [
"vendored",
] } # Override features of transitive dependencies to support IOS Simulator on M1
futures = "0.3.28"
tracing = { workspace = true }
futures-channel = "0.3.28"
Expand Down
16 changes: 14 additions & 2 deletions core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@ sd-crypto = { path = "../crates/crypto", features = [
"keymanager",
] }

sd-images = { path = "../crates/images", features = ["rspc", "serde", "specta"] }
sd-images = { path = "../crates/images", features = [
"rspc",
"serde",
"specta",
] }
sd-file-ext = { path = "../crates/file-ext" }
sd-sync = { path = "../crates/sync" }
sd-p2p = { path = "../crates/p2p", features = ["specta", "serde"] }
Expand Down Expand Up @@ -105,9 +109,17 @@ axum = "0.6.20"
http-body = "0.4.5"
pin-project-lite = "0.2.13"
bytes = "1.5.0"
reqwest = { version = "0.11.20", features = ["json"] }
reqwest = { version = "0.11.20", features = ["json", "native-tls-vendored"] }
directories = "5.0.1"

# Override features of transitive dependencies
[dependencies.openssl]
version = "=0.10.57"
features = ["vendored"]
[dependencies.openssl-sys]
version = "=0.9.93"
features = ["vendored"]

[target.'cfg(target_os = "macos")'.dependencies]
plist = "1"

Expand Down
Loading