Skip to content

Commit

Permalink
fix(lua): Make sure LuaRock identifies its version even when sideloaded
Browse files Browse the repository at this point in the history
  • Loading branch information
alerque committed Oct 23, 2024
1 parent b58d059 commit 1f83701
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
3 changes: 3 additions & 0 deletions build-aux/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ fn main() -> AnyhowResult<()> {
if let Ok(val) = env::var("VERSION_FROM_AUTOTOOLS") {
println!("cargo:rustc-env=VERGEN_GIT_DESCRIBE={val}");
builder.add_instructions(&RustcBuilder::all_rustc()?)?;
} else if let Ok(val) = env::var("LUA_ROCKSPEC_VERSION") {
println!("cargo:rustc-env=VERGEN_GIT_DESCRIBE=v{val}");
builder.add_instructions(&RustcBuilder::all_rustc()?)?;
} else {
builder.add_instructions(&GixBuilder::all_git()?)?;
};
Expand Down
2 changes: 1 addition & 1 deletion decasify-dev-1.rockspec
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ description = {

dependencies = {
"lua >= 5.1",
"luarocks-build-rust-mlua >= 0.2.2-1",
"luarocks-build-rust-mlua >= 0.2.3-1",
}

build = {
Expand Down
2 changes: 1 addition & 1 deletion decasify.rockspec.in
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ description = {

dependencies = {
"lua >= 5.1",
"luarocks-build-rust-mlua >= 0.2.2-1",
"luarocks-build-rust-mlua >= 0.2.3-1",
}

build = {
Expand Down

0 comments on commit 1f83701

Please sign in to comment.