fix: move from lua 5.3 to lua 5.2
Some checks failed
build liminix / build_zyxel-nwa50ax_mips (pull_request) Successful in 23s
build liminix / build_vm_qemu_mips (pull_request) Successful in 26s
build liminix / test_shell_customization (pull_request) Failing after 28s
build liminix / test_hostapd (pull_request) Failing after 1m25s
Some checks failed
build liminix / build_zyxel-nwa50ax_mips (pull_request) Successful in 23s
build liminix / build_vm_qemu_mips (pull_request) Successful in 26s
build liminix / test_shell_customization (pull_request) Failing after 28s
build liminix / test_hostapd (pull_request) Failing after 1m25s
otherwise, luabit will not build
This commit is contained in:
parent
78476aa743
commit
828bbfcb23
3 changed files with 6 additions and 9 deletions
|
@ -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 []) ++ [
|
||||
|
|
|
@ -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";
|
||||
|
|
|
@ -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 = ./.;
|
||||
|
|
Loading…
Add table
Reference in a new issue