dan/liminix
1
0
Fork 5
Code

more messing around with lua derivation

Browse Source
This commit is contained in:
Daniel Barlow 2024-10-03 22:58:57 +01:00
parent e5631783e1
commit 7ca822c826
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
overlay.nix
View File

@ -6,19 +6,22 @@ let
inherit (final) lib callPackage; inherit (final) lib callPackage;
}; };
inherit (final) fetchpatch; inherit (final) fetchpatch;
luaHost = prev.lua5_3.overrideAttrs(o: { luaHost =
name = "lua-tty"; let
preBuild = '' l = prev.lua5_3.overrideAttrs(o: {
makeFlagsArray+=(PLAT="posix" SYSLIBS="-Wl,-E -ldl" CFLAGS="-O2 -fPIC -DLUA_USE_POSIX -DLUA_USE_DLOPEN") 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 # lua in nixpkgs has a postInstall stanza that assumes only
# one output, we need to override that if we're going to # one output, we need to override that if we're going to
# convert to multi-output # convert to multi-output
# outputs = ["bin" "man" "out"]; # outputs = ["bin" "man" "out"];
makeFlags = makeFlags =
builtins.filter (x: (builtins.match "(PLAT|MYLIBS).*" x) == null) builtins.filter (x: (builtins.match "(PLAT|MYLIBS).*" x) == null)
o.makeFlags; o.makeFlags;
}); });
in l.override { self = l; };
s6 = prev.s6.overrideAttrs(o: s6 = prev.s6.overrideAttrs(o:
let let