Fix (kind of) scilua install
This commit is contained in:
parent
afce550dd9
commit
b25ea0c29d
|
@ -1,6 +1,6 @@
|
||||||
{pkgs, ...}: {
|
{pkgs, ...}: {
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
(lua.withPackages (ps: [
|
(luajit.withPackages (ps: [
|
||||||
(ps.callPackage ./luarocks/scilua.nix {})
|
(ps.callPackage ./luarocks/scilua.nix {})
|
||||||
]))
|
]))
|
||||||
];
|
];
|
||||||
|
|
|
@ -1,12 +1,13 @@
|
||||||
{
|
{
|
||||||
buildLuarocksPackage,
|
buildLuarocksPackage,
|
||||||
fetchurl,
|
fetchurl,
|
||||||
lua,
|
|
||||||
luaAtLeast,
|
luaAtLeast,
|
||||||
luaOlder,
|
luaOlder,
|
||||||
luaPackages,
|
callPackage,
|
||||||
|
luajit,
|
||||||
|
openblas,
|
||||||
}: let
|
}: let
|
||||||
xsys = luaPackages.callPackage ./xsys.nix {};
|
xsys = callPackage ./xsys.nix {};
|
||||||
in
|
in
|
||||||
buildLuarocksPackage {
|
buildLuarocksPackage {
|
||||||
pname = "sci";
|
pname = "sci";
|
||||||
|
@ -23,7 +24,7 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
|
disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
|
||||||
propagatedBuildInputs = [lua xsys];
|
propagatedBuildInputs = [luajit xsys openblas];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "https://github.com/stepelu/lua-sci";
|
homepage = "https://github.com/stepelu/lua-sci";
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
{
|
{
|
||||||
buildLuarocksPackage,
|
buildLuarocksPackage,
|
||||||
fetchurl,
|
fetchurl,
|
||||||
lua,
|
|
||||||
luaAtLeast,
|
luaAtLeast,
|
||||||
luaOlder,
|
luaOlder,
|
||||||
|
luajit,
|
||||||
}:
|
}:
|
||||||
buildLuarocksPackage {
|
buildLuarocksPackage {
|
||||||
pname = "xsys";
|
pname = "xsys";
|
||||||
|
@ -20,7 +20,7 @@ buildLuarocksPackage {
|
||||||
};
|
};
|
||||||
|
|
||||||
disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
|
disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
|
||||||
propagatedBuildInputs = [lua];
|
propagatedBuildInputs = [luajit];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "http://scilua.org/xsys.html";
|
homepage = "http://scilua.org/xsys.html";
|
||||||
|
|
Reference in a new issue