diff --git a/programs/lua/default.nix b/programs/lua/default.nix index f20fcb8..ce6919e 100644 --- a/programs/lua/default.nix +++ b/programs/lua/default.nix @@ -1,6 +1,6 @@ {pkgs, ...}: { home.packages = with pkgs; [ - (lua.withPackages (ps: [ + (luajit.withPackages (ps: [ (ps.callPackage ./luarocks/scilua.nix {}) ])) ]; diff --git a/programs/lua/luarocks/scilua.nix b/programs/lua/luarocks/scilua.nix index f816bb6..bb46baa 100644 --- a/programs/lua/luarocks/scilua.nix +++ b/programs/lua/luarocks/scilua.nix @@ -1,12 +1,13 @@ { buildLuarocksPackage, fetchurl, - lua, luaAtLeast, luaOlder, - luaPackages, + callPackage, + luajit, + openblas, }: let - xsys = luaPackages.callPackage ./xsys.nix {}; + xsys = callPackage ./xsys.nix {}; in buildLuarocksPackage { pname = "sci"; @@ -23,7 +24,7 @@ in }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); - propagatedBuildInputs = [lua xsys]; + propagatedBuildInputs = [luajit xsys openblas]; meta = { homepage = "https://github.com/stepelu/lua-sci"; diff --git a/programs/lua/luarocks/xsys.nix b/programs/lua/luarocks/xsys.nix index d3b88bc..6dc41c2 100644 --- a/programs/lua/luarocks/xsys.nix +++ b/programs/lua/luarocks/xsys.nix @@ -1,9 +1,9 @@ { buildLuarocksPackage, fetchurl, - lua, luaAtLeast, luaOlder, + luajit, }: buildLuarocksPackage { pname = "xsys"; @@ -20,7 +20,7 @@ buildLuarocksPackage { }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); - propagatedBuildInputs = [lua]; + propagatedBuildInputs = [luajit]; meta = { homepage = "http://scilua.org/xsys.html";