diff --git a/overlay.nix b/overlay.nix index fda6239..d8d1795 100644 --- a/overlay.nix +++ b/overlay.nix @@ -6,7 +6,7 @@ let inherit (final) lib callPackage; }; inherit (final) fetchpatch; - luaHost = prev.lua5_3.overrideAttrs(o: { + luaHost = prev.lua5_2.overrideAttrs(o: { name = "lua-tty"; preBuild = '' makeFlagsArray+=(PLAT="posix" SYSLIBS="-Wl,-E -ldl" CFLAGS="-O2 -fPIC -DLUA_USE_POSIX -DLUA_USE_DLOPEN") @@ -245,7 +245,7 @@ extraPkgs // { ]; }); - lua = crossOnly prev.lua5_3 (_: luaHost); + lua = crossOnly prev.lua5_2 (_: luaHost); mtdutils = prev.mtdutils.overrideAttrs(o: { patches = (if o ? patches then o.patches else []) ++ [ diff --git a/pkgs/iwinfo/default.nix b/pkgs/iwinfo/default.nix index 91c8437..3e01b8d 100644 --- a/pkgs/iwinfo/default.nix +++ b/pkgs/iwinfo/default.nix @@ -4,13 +4,10 @@ fetchFromGitea, ubus, libubox, - lua5_3, + lua, libnl-tiny, backend ? "nl80211" }: -let - lua = lua5_3; -in stdenv.mkDerivation rec { pname = "iwinfo"; version = "unstable-07-09-2024"; diff --git a/pkgs/tufted/default.nix b/pkgs/tufted/default.nix index 0486164..3bf41b0 100644 --- a/pkgs/tufted/default.nix +++ b/pkgs/tufted/default.nix @@ -1,11 +1,11 @@ { - lua5_3 + lua , stdenv , fetchFromGitHub , makeWrapper } : let - lua = lua5_3.withPackages (ps: with ps; [ + luaWithPackage = lua.withPackages (ps: with ps; [ luasocket luaposix fennel ]); in stdenv.mkDerivation { @@ -13,7 +13,7 @@ in stdenv.mkDerivation { version = "1"; phases = [ "unpackPhase" "installPhase" ]; buildInputs = [ - lua + luaWithPackage ]; nativeBuildInputs = [ makeWrapper ]; src = ./.;