about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2024-06-23 23:14:55 +0200
committerGitHub <noreply@github.com>2024-06-23 23:14:55 +0200
commit02bb1e0d3df3658c136499b509b985b93bcc5f5c (patch)
treed5942bc1c487562c9e55ce17297b227b874c2828
parentaa2394369619ab7ecdd990b09aeea5f231d0c4e7 (diff)
parent4858ce6b753ac4d28a3e473662e258972bc771d4 (diff)
Merge pull request #321975 from ehmry/solo5
solo5: remove unsupported qemu flag in test
-rw-r--r--pkgs/by-name/so/solo5/package.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/by-name/so/solo5/package.nix b/pkgs/by-name/so/solo5/package.nix
index 57ccd1e24b2bf..1ca866c81e5e2 100644
--- a/pkgs/by-name/so/solo5/package.nix
+++ b/pkgs/by-name/so/solo5/package.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, dosfstools, libseccomp, makeWrapper, mtools, parted
-, pkg-config, qemu, syslinux, util-linux }:
+, pkg-config, qemu_test, syslinux, util-linux }:
 
 let
   version = "0.8.1";
@@ -55,10 +55,12 @@ in stdenv.mkDerivation {
   '';
 
   doCheck = stdenv.hostPlatform.isLinux;
-  nativeCheckInputs = [ util-linux qemu ];
+  nativeCheckInputs = [ util-linux qemu_test ];
   checkPhase = ''
     runHook preCheck
     patchShebangs tests
+    substituteInPlace scripts/virtio-run/solo5-virtio-run.sh \
+      --replace " -no-acpi" ""
     ./tests/bats-core/bats ./tests/tests.bats
     runHook postCheck
   '';