From 045d13a08d6a43d6160b67dc5d21d6d63977e23a Mon Sep 17 00:00:00 2001 From: Matthias Ahouansou Date: Sun, 28 Apr 2024 08:10:43 +0100 Subject: [PATCH] feat: allow building with the system Lua --- yazi-cli/Cargo.toml | 6 +++++- yazi-core/Cargo.toml | 6 +++--- yazi-fm/Cargo.toml | 8 ++++---- yazi-plugin/Cargo.toml | 4 ++-- yazi-scheduler/Cargo.toml | 6 +++--- 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/yazi-cli/Cargo.toml b/yazi-cli/Cargo.toml index 6464852f..a8359c6b 100644 --- a/yazi-cli/Cargo.toml +++ b/yazi-cli/Cargo.toml @@ -8,8 +8,12 @@ description = "Yazi command-line interface" homepage = "https://yazi-rs.github.io" repository = "https://github.com/sxyazi/yazi" +[features] +default = [ "vendored-lua" ] +vendored-lua = [ "yazi-dds/vendored-lua" ] + [dependencies] -yazi-dds = { path = "../yazi-dds", version = "0.2.5" } +yazi-dds = { path = "../yazi-dds", version = "0.2.5", default-features = false } # External dependencies anyhow = "1.0.82" diff --git a/yazi-core/Cargo.toml b/yazi-core/Cargo.toml index d7dc8b00..5089bdb8 100644 --- a/yazi-core/Cargo.toml +++ b/yazi-core/Cargo.toml @@ -12,9 +12,9 @@ repository = "https://github.com/sxyazi/yazi" yazi-adaptor = { path = "../yazi-adaptor", version = "0.2.5" } yazi-boot = { path = "../yazi-boot", version = "0.2.5" } yazi-config = { path = "../yazi-config", version = "0.2.5" } -yazi-dds = { path = "../yazi-dds", version = "0.2.5" } -yazi-plugin = { path = "../yazi-plugin", version = "0.2.5" } -yazi-proxy = { path = "../yazi-proxy", version = "0.2.5" } +yazi-dds = { path = "../yazi-dds", version = "0.2.5", default-features = false } +yazi-plugin = { path = "../yazi-plugin", version = "0.2.5", default-features = false } +yazi-proxy = { path = "../yazi-proxy", version = "0.2.5", default-features = false } yazi-scheduler = { path = "../yazi-scheduler", version = "0.2.5" } yazi-shared = { path = "../yazi-shared", version = "0.2.5" } diff --git a/yazi-fm/Cargo.toml b/yazi-fm/Cargo.toml index 6f7112fc..9aa573d7 100644 --- a/yazi-fm/Cargo.toml +++ b/yazi-fm/Cargo.toml @@ -10,16 +10,16 @@ repository = "https://github.com/sxyazi/yazi" [features] default = [ "vendored-lua" ] -vendored-lua = [ "mlua/vendored" ] +vendored-lua = [ "mlua/vendored", "yazi-dds/vendored-lua", "yazi-plugin/vendored-lua", "yazi-proxy/vendored-lua" ] [dependencies] yazi-adaptor = { path = "../yazi-adaptor", version = "0.2.5" } yazi-boot = { path = "../yazi-boot", version = "0.2.5" } yazi-config = { path = "../yazi-config", version = "0.2.5" } yazi-core = { path = "../yazi-core", version = "0.2.5" } -yazi-dds = { path = "../yazi-dds", version = "0.2.5" } -yazi-plugin = { path = "../yazi-plugin", version = "0.2.5" } -yazi-proxy = { path = "../yazi-proxy", version = "0.2.5" } +yazi-dds = { path = "../yazi-dds", version = "0.2.5", default-features = false } +yazi-plugin = { path = "../yazi-plugin", version = "0.2.5", default-features = false } +yazi-proxy = { path = "../yazi-proxy", version = "0.2.5", default-features = false } yazi-shared = { path = "../yazi-shared", version = "0.2.5" } # External dependencies diff --git a/yazi-plugin/Cargo.toml b/yazi-plugin/Cargo.toml index 55033878..62a7cfaf 100644 --- a/yazi-plugin/Cargo.toml +++ b/yazi-plugin/Cargo.toml @@ -16,8 +16,8 @@ vendored-lua = [ "mlua/vendored" ] yazi-adaptor = { path = "../yazi-adaptor", version = "0.2.5" } yazi-boot = { path = "../yazi-boot", version = "0.2.5" } yazi-config = { path = "../yazi-config", version = "0.2.5" } -yazi-dds = { path = "../yazi-dds", version = "0.2.5" } -yazi-proxy = { path = "../yazi-proxy", version = "0.2.5" } +yazi-dds = { path = "../yazi-dds", version = "0.2.5", default-features = false } +yazi-proxy = { path = "../yazi-proxy", version = "0.2.5", default-features = false } yazi-shared = { path = "../yazi-shared", version = "0.2.5" } # External dependencies diff --git a/yazi-scheduler/Cargo.toml b/yazi-scheduler/Cargo.toml index d35b11e1..2af2797d 100644 --- a/yazi-scheduler/Cargo.toml +++ b/yazi-scheduler/Cargo.toml @@ -10,9 +10,9 @@ repository = "https://github.com/sxyazi/yazi" [dependencies] yazi-config = { path = "../yazi-config", version = "0.2.5" } -yazi-dds = { path = "../yazi-dds", version = "0.2.5" } -yazi-plugin = { path = "../yazi-plugin", version = "0.2.5" } -yazi-proxy = { path = "../yazi-proxy", version = "0.2.5" } +yazi-dds = { path = "../yazi-dds", version = "0.2.5", default-features = false } +yazi-plugin = { path = "../yazi-plugin", version = "0.2.5", default-features = false } +yazi-proxy = { path = "../yazi-proxy", version = "0.2.5", default-features = false } yazi-shared = { path = "../yazi-shared", version = "0.2.5" } # External dependencies