From 0813d09fde421260d590613a24f17609794e6b20 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Fri, 23 Aug 2024 21:55:49 +0200 Subject: [PATCH] fix(overlay): remove the weird lua_no_readline overlay It's not a proper overlay because it breaks the splicing for luaOnBuild and therefore breaks the rest. Signed-off-by: Raito Bezarius --- overlay.nix | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/overlay.nix b/overlay.nix index 454fe84..09acaad 100644 --- a/overlay.nix +++ b/overlay.nix @@ -4,19 +4,20 @@ let inherit (final) lib callPackage; }; inherit (final) fetchpatch; - lua_no_readline = 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") - ''; - # lua in nixpkgs has a postInstall stanza that assumes only - # one output, we need to override that if we're going to - # convert to multi-output - # outputs = ["bin" "man" "out"]; - makeFlags = - builtins.filter (x: (builtins.match "(PLAT|MYLIBS).*" x) == null) - o.makeFlags; - }); + lua_no_readline = prev.lua5_3; +# lua_no_readline = 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") +# ''; +# # lua in nixpkgs has a postInstall stanza that assumes only +# # one output, we need to override that if we're going to +# # convert to multi-output +# # outputs = ["bin" "man" "out"]; +# makeFlags = +# builtins.filter (x: (builtins.match "(PLAT|MYLIBS).*" x) == null) +# o.makeFlags; +# }); s6 = prev.s6.overrideAttrs(o: let