From ad7a9cdb96e86c3330a4bd0965f583f0eb7c61a9 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 18 Mar 2021 00:16:09 +0100 Subject: [PATCH] solo5: disable checkPhase instead of setting to null, run hooks --- pkgs/os-specific/solo5/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/solo5/default.nix b/pkgs/os-specific/solo5/default.nix index 4b5c1232a86..71584aff776 100644 --- a/pkgs/os-specific/solo5/default.nix +++ b/pkgs/os-specific/solo5/default.nix @@ -51,15 +51,14 @@ in stdenv.mkDerivation { runHook postInstall ''; - doCheck = true; + doCheck = stdenv.hostPlatform.isLinux; checkInputs = [ util-linux qemu ]; - checkPhase = if stdenv.hostPlatform.isLinux then - '' + checkPhase = '' + runHook preCheck patchShebangs tests ./tests/bats-core/bats ./tests/tests.bats - '' - else - null; + runHook postCheck + ''; meta = with lib; { description = "Sandboxed execution environment";