Fix (kind of) scilua install
This commit is contained in:
parent
afce550dd9
commit
b25ea0c29d
|
@ -1,6 +1,6 @@
|
|||
{pkgs, ...}: {
|
||||
home.packages = with pkgs; [
|
||||
(lua.withPackages (ps: [
|
||||
(luajit.withPackages (ps: [
|
||||
(ps.callPackage ./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";
|
||||
|
|
|
@ -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";
|
||||
|
|
Reference in a new issue