From 470acb059aebb884aef336ffaf142db8ad6a0757 Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Fri, 18 Nov 2022 19:50:34 -0500 Subject: [PATCH] remove bios qemu script --- lib/apps.nix | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/lib/apps.nix b/lib/apps.nix index 1d7c991..5599a4f 100644 --- a/lib/apps.nix +++ b/lib/apps.nix @@ -1,14 +1,4 @@ pkgs: -let - qemu-opts = builtins.concatStringsSep " " [ - "${pkgs.qemu_kvm}/bin/qemu-kvm" - "-cpu host" - "-usbdevice tablet" - "-smp cores=4" - "-m 4096" - ]; - -in builtins.mapAttrs (n: v: { type = "app"; @@ -20,11 +10,13 @@ builtins.mapAttrs exec $jupy/bin/python -m jupyterlab "$@" ''; - qemu-bios = '' - exec ${qemu-opts} "$@" - ''; - - qemu-uefi = '' - exec ${qemu-opts} -bios ${pkgs.OVMF.fd}/FV/OVMF.fd "$@" - ''; + qemu = toString [ + "exec ${pkgs.qemu_kvm}/bin/qemu-kvm" + "-cpu host" + "-usbdevice tablet" + "-smp cores=4" + "-m 4096" + "-bios ${pkgs.OVMF.fd}/FV/OVMF.fd" + "\"$@\"" + ]; }