From e84285e576d0086f371b0016b4a9080df653ecdf Mon Sep 17 00:00:00 2001
From: Daniel Barlow <dan@telent.net>
Date: Wed, 22 Mar 2023 19:28:34 +0000
Subject: [PATCH] remove second copy of lua
---
overlay.nix | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/overlay.nix b/overlay.nix
index 254610d46..03170399d 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -2,6 +2,16 @@ final: prev:
let
extraPkgs = import ./pkgs/default.nix { inherit (final) callPackage; };
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
extraPkgs // {
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:
let patch = fetchpatch {
# add "p" directive in s6-log