maybe fix nixpkgs-unstable lua
This commit is contained in:
parent
5a5c27ab9f
commit
9f58e7b926
@ -6,7 +6,7 @@ let
|
||||
inherit (final) lib callPackage;
|
||||
};
|
||||
inherit (final) fetchpatch;
|
||||
lua_no_readline = prev.lua5_3.overrideAttrs(o: {
|
||||
luaHost = 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")
|
||||
@ -43,7 +43,6 @@ let
|
||||
(if o ? patches then o.patches else []) ++
|
||||
(if patch_needed then [ patch ] else []);
|
||||
});
|
||||
lua = let s = lua_no_readline.override { self = s; }; in s;
|
||||
in
|
||||
extraPkgs // {
|
||||
# liminix library functions
|
||||
@ -204,8 +203,7 @@ extraPkgs // {
|
||||
];
|
||||
});
|
||||
|
||||
luaFull = prev.lua;
|
||||
inherit lua;
|
||||
lua = crossOnly prev.lua5_3 (_: luaHost);
|
||||
|
||||
mtdutils = prev.mtdutils.overrideAttrs(o: {
|
||||
patches = (if o ? patches then o.patches else []) ++ [
|
||||
|
@ -4,13 +4,15 @@
|
||||
writeShellScript,
|
||||
writeFennel,
|
||||
runCommand,
|
||||
fennel,
|
||||
lib,
|
||||
lua,
|
||||
pkgsBuildBuild,
|
||||
}:
|
||||
let
|
||||
run-liminix-vm = pkgsBuildBuild.writeFennel "run-liminix-vm" {
|
||||
packages = [ qemuLim lua.pkgs.luaposix lua.pkgs.fennel ];
|
||||
writeFennel = pkgsBuildBuild.writeFennel.override { inherit lua; };
|
||||
run-liminix-vm = writeFennel "run-liminix-vm" {
|
||||
packages = [ qemuLim lua.pkgs.luaposix fennel ];
|
||||
} ./run-liminix-vm.fnl;
|
||||
connect = writeShellScript "connect-vm" ''
|
||||
export PATH="${lib.makeBinPath [ socat ]}:$PATH"
|
||||
|
Loading…
Reference in New Issue
Block a user