From e6da29ad6b6d15b67fdd6f862f2a939a4542ee7b Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 29 Jul 2025 19:00:48 +0100 Subject: [PATCH] packaging: use the upstream `mesonCheckPhase` for `installCheckPhase` This gets us `--print-errorlogs` and `--timeout-multiplier=0` for free, and also fixes the concatenation logic with `__structuredAttrs`. Change-Id: I6a6a69643ea7224cb24508505c554143f83ae243 --- package.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/package.nix b/package.nix index 4e367fa96..0bd24ba76 100644 --- a/package.nix +++ b/package.nix @@ -450,13 +450,12 @@ stdenv.mkDerivation (finalAttrs: { "--print-errorlogs" ]; - installCheckPhase = '' - runHook preInstallCheck - flagsArray=($mesonInstallCheckFlags "''${mesonInstallCheckFlagsArray[@]}") - meson test --no-rebuild "''${flagsArray[@]}" - runHook postInstallCheck + preInstallCheck = '' + mesonCheckFlags=("''${mesonInstallCheckFlags[@]}") ''; + installCheckPhase = "mesonCheckPhase"; + separateDebugInfo = !hostPlatform.isStatic && !finalAttrs.dontBuild; strictDeps = true;