diff --git a/.cargo/config.toml b/.cargo/config.toml index 07cbc23195..23438b442b 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -26,3 +26,6 @@ rustflags = [ "-C", "target-feature=+crt-static", # This fixes the linking issue when compiling livekit on Windows ] + +[env] +MACOSX_DEPLOYMENT_TARGET = "10.15.7" diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs index 87d14e1da9..901cecae4b 100644 --- a/crates/zed/src/main.rs +++ b/crates/zed/src/main.rs @@ -326,6 +326,7 @@ fn main() { .or_else(read_proxy_from_env); let http = { let _guard = Tokio::handle(cx).enter(); + ReqwestClient::proxy_and_user_agent(proxy_url, &user_agent) .expect("could not start HTTP client") }; diff --git a/script/bundle-mac b/script/bundle-mac index e943dfb8ef..d65a505fa3 100755 --- a/script/bundle-mac +++ b/script/bundle-mac @@ -70,7 +70,6 @@ export ZED_RELEASE_CHANNEL="${channel}" popd export ZED_BUNDLE=true -export MACOSX_DEPLOYMENT_TARGET=10.15.7 cargo_bundle_version=$(cargo -q bundle --help 2>&1 | head -n 1 || echo "") if [ "$cargo_bundle_version" != "cargo-bundle v0.6.0-zed" ]; then