pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: add vendored_curl feature (#3766)

Browse source
This commit is contained in:
tranzystorekk 2024-11-15 15:20:20 +01:00 • committed by GitHub
parent 464771194a
commit bfaa6c3e3f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Cargo.toml
View file

@ -80,8 +80,10 @@ pkg-fmt = "tgz"
[features] [features]
# See remarks in zellij_utils/Cargo.toml # See remarks in zellij_utils/Cargo.toml
default = ["zellij-utils/plugins_from_target"] default = ["plugins_from_target", "vendored_curl"]
plugins_from_target = ["zellij-utils/plugins_from_target"]
disable_automatic_asset_installation = ["zellij-utils/disable_automatic_asset_installation"] disable_automatic_asset_installation = ["zellij-utils/disable_automatic_asset_installation"]
vendored_curl = ["zellij-utils/vendored_curl"]
unstable = ["zellij-client/unstable", "zellij-utils/unstable"] unstable = ["zellij-client/unstable", "zellij-utils/unstable"]
singlepass = ["zellij-server/singlepass"] singlepass = ["zellij-server/singlepass"]

7
zellij-utils/Cargo.toml
View file

@ -56,9 +56,9 @@ async-std = { version = "1.3.0", features = ["unstable", "attributes"] }
notify-debouncer-full = "0.1.0" notify-debouncer-full = "0.1.0"
humantime = "2.1.0" humantime = "2.1.0"
futures = "0.3.28" futures = "0.3.28"
openssl-sys = { version = "0.9.93", features = ["vendored"] } openssl-sys = { version = "0.9.93", features = ["vendored"], optional = true }
isahc = "1.7.2" isahc = { version = "1.7.2", default-features = false, features = ["http2", "text-decoding"] }
curl-sys = { version = "0.4", features = ["force-system-lib-on-osx"] } curl-sys = { version = "0.4", features = ["force-system-lib-on-osx"], optional = true }
[dev-dependencies] [dev-dependencies]
insta = { version = "1.6.0", features = ["backtrace"] } insta = { version = "1.6.0", features = ["backtrace"] }
@ -75,3 +75,4 @@ prost-build = "0.11.9"
disable_automatic_asset_installation = [] disable_automatic_asset_installation = []
unstable = [] unstable = []
plugins_from_target = [] plugins_from_target = []
vendored_curl = ["isahc/static-curl", "dep:openssl-sys", "dep:curl-sys"]