mirror/spacedrive
1
0
Fork 0
mirror of https://github.com/spacedriveapp/spacedrive.git synced 2026-05-18 21:36:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

[ENG-1325] Vendor openssl in tauri (#1636)

Browse Source 
* Vendor openssl dependency

* Remove bindgen, seems like windows don't like it
 - Add OPENSSL_RUST_USE_NASM to force windows to use nasm

* Add native-tls-vendored to reqwest
 - Shouldn't change much as the openssl crates override was already dealing with the vendoring anyway
This commit is contained in:
Vítor Vasconcellos
2023-10-20 05:22:36 -03:00
committed by GitHub
parent d898b16cb9
commit baf4fc3b59
6 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.cargo/config.toml.mustache
View File

@@ -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]

BIN
Cargo.lock generated
View File

Binary file not shown.

2
Cargo.toml
View File

@@ -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" }

1
apps/desktop/src-tauri/Cargo.toml
View File

@@ -19,6 +19,7 @@ tauri = { version = "1.5.2", features = [
"shell-all",
"updater",
"window-all",
"native-tls-vendored"
] }
rspc = { workspace = true, features = ["tauri"] }

6
apps/mobile/modules/sd-core/core/Cargo.toml
View File

@@ -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"

16
core/Cargo.toml
View File

@@ -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"] }
@@ -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"