dan
/
liminix
1
0
Fork 5
Code Issues 3 Pull Requests 2 Projects Releases Wiki Activity

use patched qemu only for run-liminix-vm

pull/2/head
Daniel Barlow 2024-01-03 17:53:30 +00:00
parent d2e29543e2
commit 9369fdf314
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
overlay.nix
View File

@ -170,11 +170,11 @@ extraPkgs // {
pppBuild = prev.ppp;
qemu = let q = prev.qemu.overrideAttrs (o: {
qemuLim = let q = prev.qemu.overrideAttrs (o: {
patches = o.patches ++ [
./pkgs/qemu/arm-image-friendly-load-addr.patch
];
}); in q.override { sdlSupport = false; };
}); in q.override { nixosTestRunner = true; sdlSupport = false; };
rsyncSmall =
let r = prev.rsync.overrideAttrs(o: {

4
pkgs/run-liminix-vm/default.nix
View File

@ -1,5 +1,5 @@
{
qemu
qemuLim
, socat
, writeShellScript
, writeFennel
@ -9,7 +9,7 @@
, pkgsBuildBuild
}: let
run-liminix-vm = pkgsBuildBuild.writeFennel "run-liminix-vm" {
packages = [ qemu lua.pkgs.luaposix lua.pkgs.fennel ];
packages = [ qemuLim lua.pkgs.luaposix lua.pkgs.fennel ];
} ./run-liminix-vm.fnl;
connect = writeShellScript "connect-vm" ''
export PATH="${lib.makeBinPath [socat]}:$PATH"