lbailly/liminix
1
0
Fork 0
forked from DGNum/liminix
Code Pull requests 2 Activity Actions

use patched qemu only for run-liminix-vm

Browse source
This commit is contained in:
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; pppBuild = prev.ppp;
qemu = let q = prev.qemu.overrideAttrs (o: { qemuLim = let q = prev.qemu.overrideAttrs (o: {
patches = o.patches ++ [ patches = o.patches ++ [
./pkgs/qemu/arm-image-friendly-load-addr.patch ./pkgs/qemu/arm-image-friendly-load-addr.patch
]; ];
}); in q.override { sdlSupport = false; }; }); in q.override { nixosTestRunner = true; sdlSupport = false; };
rsyncSmall = rsyncSmall =
let r = prev.rsync.overrideAttrs(o: { let r = prev.rsync.overrideAttrs(o: {

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

@ -1,5 +1,5 @@
{ {
qemu qemuLim
, socat , socat
, writeShellScript , writeShellScript
, writeFennel , writeFennel
@ -9,7 +9,7 @@
, pkgsBuildBuild , pkgsBuildBuild
}: let }: let
run-liminix-vm = pkgsBuildBuild.writeFennel "run-liminix-vm" { 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; } ./run-liminix-vm.fnl;
connect = writeShellScript "connect-vm" '' connect = writeShellScript "connect-vm" ''
export PATH="${lib.makeBinPath [socat]}:$PATH" export PATH="${lib.makeBinPath [socat]}:$PATH"