Skip to content

Commit

Permalink
chore(deps): Make LuaRocks a dependency for all build types so we can…
Browse files Browse the repository at this point in the history
… find manifests
  • Loading branch information
alerque committed Nov 23, 2024
1 parent 81f7b2b commit 3c670e1
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 3 deletions.
1 change: 1 addition & 0 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ task:
--disable-font-variations \
--with-system-lua-sources \
--with-system-luarocks \
--with-luarocks=luarocks51 \
--without-manual
make_script:
- gmake all
Expand Down
4 changes: 4 additions & 0 deletions build-aux/pkg.nix
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ let
ps:
with ps;
[
# used for module detection, also recommended at runtime for 3rd party module installation
luarocks

# modules used at runtime
cassowary
cldr
fluent
Expand Down
3 changes: 1 addition & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ QUE_PROGVAR([diff])
QUE_PROGVAR([find])
QUE_PROGVAR([head])
QUE_PROGVAR([jq])
QUE_PROGVAR([luarocks])
QUE_PROGVAR([pdfinfo])
QUE_PROGVAR([sort])
QUE_PROGVAR([xargs])
Expand Down Expand Up @@ -189,7 +190,6 @@ AM_COND_IF([DEVELOPER_TOOLS], [
QUE_PROGVAR([curl])
QUE_PROGVAR([ldoc])
QUE_PROGVAR([luacheck])
QUE_PROGVAR([luarocks])
QUE_PROGVAR([nix])
QUE_PROGVAR([npm])
QUE_PROGVAR([perl])
Expand Down Expand Up @@ -227,7 +227,6 @@ AM_COND_IF([SYSTEM_LUAROCKS], [
AX_LUA_MODULE(penlight, pl)
AX_LUA_MODULE(vstruct)
], [
QUE_PROGVAR([luarocks])
QUE_PROGVAR([git]) # required for luarocks to install zlib rock
])

Expand Down
1 change: 0 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@
"--with-manual"
];
nativeBuildInputs = sile.nativeBuildInputs ++ [
pkgs.luarocks
# For regression test diff highlighting
pkgs.delta
# For commitlint git hook
Expand Down

0 comments on commit 3c670e1

Please sign in to comment.