dan
/
liminix
1
0
Fork 5
Code Issues 3 Pull Requests 2 Projects Releases Wiki Activity

remove second copy of lua

module-based-network
Daniel Barlow 2023-03-22 19:28:34 +00:00
parent 64d8602408
commit e84285e576
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
overlay.nix
View File

@ -2,6 +2,16 @@ final: prev:
let let
extraPkgs = import ./pkgs/default.nix { inherit (final) callPackage; }; extraPkgs = import ./pkgs/default.nix { inherit (final) callPackage; };
inherit (final) fetchpatch; inherit (final) fetchpatch;
lua = prev.lua5_3.overrideAttrs(o: {
name = "lua-tty";
preBuild = ''
makeFlagsArray+=(PLAT="posix" SYSLIBS="-Wl,-E -ldl" CFLAGS="-O2 -fPIC -DLUA_USE_POSIX -DLUA_USE_DLOPEN")
'';
makeFlags =
builtins.filter (x: (builtins.match "(PLAT|MYLIBS).*" x) == null)
o.makeFlags;
});
in in
extraPkgs // { extraPkgs // {
strace = prev.strace.override { libunwind = null; }; strace = prev.strace.override { libunwind = null; };
@ -17,6 +27,8 @@ extraPkgs // {
]; ];
}); });
lua5_3 = let s = lua.override { self = s; }; in s;
s6 = prev.s6.overrideAttrs(o: s6 = prev.s6.overrideAttrs(o:
let patch = fetchpatch { let patch = fetchpatch {
# add "p" directive in s6-log # add "p" directive in s6-log