rename luaSmall package to lua
This commit is contained in:
parent
3900683413
commit
41687e916d
|
@ -1,10 +1,7 @@
|
|||
{
|
||||
writeFennelScript
|
||||
, luaSmall
|
||||
, linotify
|
||||
}:
|
||||
writeFennelScript "acquire-delegated-prefix"
|
||||
[
|
||||
(linotify.override { lua = luaSmall; })
|
||||
]
|
||||
[ linotify ]
|
||||
./acquire-delegated-prefix.fnl
|
||||
|
|
|
@ -39,6 +39,7 @@ let
|
|||
(if o ? patches then o.patches else []) ++
|
||||
(if patch_needed then [ patch ] else []);
|
||||
});
|
||||
lua = let s = lua_no_readline.override { self = s; }; in s;
|
||||
in
|
||||
extraPkgs // {
|
||||
mtdutils = prev.mtdutils.overrideAttrs(o: {
|
||||
|
@ -97,7 +98,8 @@ extraPkgs // {
|
|||
];
|
||||
});
|
||||
|
||||
luaSmall = let s = lua_no_readline.override { self = s; }; in s;
|
||||
luaFull = prev.lua;
|
||||
inherit lua;
|
||||
|
||||
inherit s6;
|
||||
s6-linux-init = prev.s6-linux-init.override {
|
||||
|
|
|
@ -1,13 +1,10 @@
|
|||
{
|
||||
luaSmall
|
||||
lua
|
||||
, netlink-lua
|
||||
, writeFennelScript
|
||||
, runCommand
|
||||
}:
|
||||
let
|
||||
lua = luaSmall;
|
||||
netlink = netlink-lua.override {inherit lua;};
|
||||
in runCommand "ifwait" {} ''
|
||||
runCommand "ifwait" {} ''
|
||||
mkdir -p $out/bin
|
||||
cp -p ${writeFennelScript "ifwait" [netlink] ./ifwait.fnl} $out/bin/ifwait
|
||||
cp -p ${writeFennelScript "ifwait" [netlink-lua] ./ifwait.fnl} $out/bin/ifwait
|
||||
''
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
runCommand
|
||||
, luaSmall
|
||||
, lua
|
||||
, runtimeShell
|
||||
, fetchurl
|
||||
, lib
|
||||
|
@ -14,15 +14,15 @@ in name : packages : source :
|
|||
hash = "sha256-hYSD3rBYF8iTjBOA1m+TvUu8BSp8q6uIMUXi0xwo/dU=";
|
||||
};
|
||||
|
||||
luapath = builtins.map (f: "${f}/share/lua/${luaSmall.luaversion}/?.lua;") packages;
|
||||
luacpath = builtins.map (f: "${f}/lib/lua/${luaSmall.luaversion}/?.so;") packages;
|
||||
luapath = builtins.map (f: "${f}/share/lua/${lua.luaversion}/?.lua;") packages;
|
||||
luacpath = builtins.map (f: "${f}/lib/lua/${lua.luaversion}/?.so;") packages;
|
||||
in runCommand name {
|
||||
nativeBuildInputs = [ lua ];
|
||||
} ''
|
||||
echo $PATH
|
||||
#!${runtimeShell}
|
||||
(
|
||||
echo "#!${luaSmall}/bin/lua"
|
||||
echo "#!${lua}/bin/lua"
|
||||
echo "package.path = ${lib.strings.escapeShellArg luapath} .. package.path"
|
||||
echo "package.cpath = ${lib.strings.escapeShellArg luacpath} .. package.cpath"
|
||||
lua ${fennel} --correlate --compile ${source}
|
||||
|
|
|
@ -6,8 +6,8 @@ let
|
|||
overlay = import "${liminix}/overlay.nix";
|
||||
pkgs = import <nixpkgs> { overlays = [overlay]; };
|
||||
script = pkgs.writeFennelScript "foo" [] ./hello.fnl;
|
||||
inherit (pkgs.luaSmall.pkgs) fifo;
|
||||
netlink = pkgs.netlink-lua.override { lua = pkgs.luaSmall; };
|
||||
inherit (pkgs.lua.pkgs) fifo;
|
||||
netlink = pkgs.netlink-lua;
|
||||
script2 = pkgs.writeFennelScript "foo2" [fifo netlink] ./hello.fnl;
|
||||
in pkgs.runCommand "check" {
|
||||
} ''
|
||||
|
|
Loading…
Reference in New Issue