diff --git a/.cirrus.yml b/.cirrus.yml index b4c9b3f47..61d6ab423 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -50,6 +50,7 @@ task: --disable-font-variations \ --with-system-lua-sources \ --with-system-luarocks \ + --with-luarocks=luarocks51 \ --without-manual make_script: - gmake all diff --git a/build-aux/pkg.nix b/build-aux/pkg.nix index 2cf64e802..6b9fd535e 100644 --- a/build-aux/pkg.nix +++ b/build-aux/pkg.nix @@ -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 diff --git a/configure.ac b/configure.ac index d3ff56d1a..0404287c7 100644 --- a/configure.ac +++ b/configure.ac @@ -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]) @@ -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]) @@ -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 ]) diff --git a/flake.nix b/flake.nix index 0a9c4ee36..4a2814a36 100644 --- a/flake.nix +++ b/flake.nix @@ -87,7 +87,6 @@ "--with-manual" ]; nativeBuildInputs = sile.nativeBuildInputs ++ [ - pkgs.luarocks # For regression test diff highlighting pkgs.delta # For commitlint git hook