commit ce5835fb59d8d52354875d73f103527d704b93cd Author: Jakub Panek Date: Sun Jun 26 16:27:19 2022 +0200 Author: Jakub Jirutka Date: Mon Jul 25 01:56:21 2022 +0200 fix: link against system libraries diff --git a/Cargo.lock b/Cargo.lock index b41c470..0df38d4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2749,7 +2749,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aad2e95f77dde4d6a636ca1c713f3efdaa46bb2dae33d7d2abeea992baeb9cb3" dependencies = [ "cc", - "libz-sys", "openssl-sys", "pkg-config", ] @@ -2851,15 +2850,6 @@ dependencies = [ "hashbrown 0.12.3", ] -[[package]] -name = "lua-src" -version = "546.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cb00c1380f1b4b4928dd211c07301ffa34872a239e590bd3219d9e5b213face" -dependencies = [ - "cc", -] - [[package]] name = "luahelper" version = "0.1.0" @@ -2870,15 +2860,6 @@ dependencies = [ "wezterm-dynamic", ] -[[package]] -name = "luajit-src" -version = "210.4.5+resty2cf5186" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b7992a40e602786272d84c6f2beca44a588ededcfd57b48ec6f82008a7cb97" -dependencies = [ - "cc", -] - [[package]] name = "mac_address" version = "1.1.5" @@ -3087,8 +3068,6 @@ dependencies = [ "futures-core", "futures-task", "futures-util", - "lua-src", - "luajit-src", "num-traits", "once_cell", "pkg-config", diff --git a/codec/Cargo.toml b/codec/Cargo.toml index 6ba4a6d..2c1fe9b 100644 --- a/codec/Cargo.toml +++ b/codec/Cargo.toml @@ -21,7 +21,7 @@ termwiz = { path = "../termwiz" } thiserror = "1.0" varbincode = "0.1" wezterm-term = { path = "../term", features=["use_serde"] } -zstd = "0.11" +zstd = { version = "0.11", features = ["pkg-config"] } [dev-dependencies] base91 = { path = "../base91" } diff --git a/config/Cargo.toml b/config/Cargo.toml index 262edd5..40393cd 100644 --- a/config/Cargo.toml +++ b/config/Cargo.toml @@ -23,7 +23,7 @@ lazy_static = "1.4" libc = "0.2" log = "0.4" luahelper = { path = "../luahelper" } -mlua = {version="0.8.3", features=["vendored", "lua54", "async", "send"]} +mlua = { version="0.8.3", features = ["lua54", "async", "send"] } # file change notification notify = "5.0.0" once_cell = "1.8" diff --git a/deps/freetype/build.rs b/deps/freetype/build.rs index b4a8407..c3b16d4 100644 --- a/deps/freetype/build.rs +++ b/deps/freetype/build.rs @@ -235,9 +235,9 @@ fn git_submodule_update() { } fn main() { - zlib(); - libpng(); - freetype(); + println!("cargo:rustc-link-lib=z"); + println!("cargo:rustc-link-lib=png"); + println!("cargo:rustc-link-lib=freetype"); let out_dir = env::var("OUT_DIR").unwrap(); println!("cargo:outdir={}", out_dir); println!("cargo:rustc-env=MACOSX_DEPLOYMENT_TARGET=10.9"); diff --git a/deps/harfbuzz/build.rs b/deps/harfbuzz/build.rs index e5ad24c..af0af28 100644 --- a/deps/harfbuzz/build.rs +++ b/deps/harfbuzz/build.rs @@ -64,7 +64,7 @@ fn git_submodule_update() { } fn main() { - harfbuzz(); + println!("cargo:rustc-link-lib=harfbuzz"); let out_dir = env::var("OUT_DIR").unwrap(); println!("cargo:outdir={}", out_dir); println!("cargo:rustc-env=MACOSX_DEPLOYMENT_TARGET=10.9"); diff --git a/wezterm-ssh/Cargo.toml b/wezterm-ssh/Cargo.toml index 5efae43..5bb9278 100644 --- a/wezterm-ssh/Cargo.toml +++ b/wezterm-ssh/Cargo.toml @@ -31,7 +31,7 @@ portable-pty = { version="0.8", path = "../pty" } regex = "1" smol = "1.2" ssh2 = {version="0.9.3", features=["openssl-on-win32"], optional = true} -libssh-rs = {version="0.2.0", features=["vendored"], optional = true} +libssh-rs = {version="0.2.0", optional = true} #libssh-rs = {path="../../libssh-rs/libssh-rs", features=["vendored"], optional = true} thiserror = "1.0" socket2 = "0.5" diff --git a/window/Cargo.toml b/window/Cargo.toml index 304e67b..9d3f8e7 100644 --- a/window/Cargo.toml +++ b/window/Cargo.toml @@ -78,7 +78,7 @@ smithay-client-toolkit = {version = "0.16", default-features=false, optional=tru wayland-protocols = {version="0.29", optional=true} wayland-client = {version="0.29", optional=true} wayland-egl = {version="0.29", optional=true} -xcb-imdkit = { version="0.2", git="https://github.com/wez/xcb-imdkit-rs.git", branch="hangfix"} +xcb-imdkit = { version="0.2", git="https://github.com/wez/xcb-imdkit-rs.git", branch="hangfix", features = ["use-system-lib"] } zbus = "3.13" zvariant = "3.14" futures-util = "0.3"