liminix

commit 9369fdf314c5ffe6e5d854659c7b12729bb7a608
parent d2e29543e2d3e12149372d1b32c51cf9d1e8eae0
Author: Daniel Barlow <dan@telent.net>
Date:   Wed,  3 Jan 2024 17:53:30 +0000

use patched qemu only for run-liminix-vm

Diffstat:
M
overlay.nix
 | 
4
++--
M
pkgs/run-liminix-vm/default.nix
 | 
4
++--

2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/overlay.nix b/overlay.nix
@@ -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: {
diff --git a/pkgs/run-liminix-vm/default.nix b/pkgs/run-liminix-vm/default.nix
@@ -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"