From 52872026fb77054c51a9b79c6ae93a17ecec8d89 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 1 Aug 2025 18:03:47 +0100 Subject: [PATCH] packaging: actually run install checks `mesonCheckPhase` of course runs `preCheck` and `postCheck` hooks, not `preInstallCheck`, so this was not doing the right thing. Really sorry for breaking CI :( Fixes: e6da29ad6b6d15b67fdd6f862f2a939a4542ee7b Change-Id: I6a6a69642a242e2c8bfe10ac61d3f6756d666548 --- package.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/package.nix b/package.nix index 35cc331fe..1dbc86f9e 100644 --- a/package.nix +++ b/package.nix @@ -444,11 +444,17 @@ stdenv.mkDerivation (finalAttrs: { "--suite=installcheck" ]; - preInstallCheck = '' - mesonCheckFlags=("''${mesonInstallCheckFlags[@]}") - ''; + installCheckPhase = '' + runHook preInstallCheck - installCheckPhase = "mesonCheckPhase"; + ( + unset -v preCheck preCheckHooks postCheck postCheckHooks + mesonCheckFlags=("''${mesonInstallCheckFlags[@]}") + mesonCheckPhase + ) + + runHook postInstallCheck + ''; separateDebugInfo = !hostPlatform.isStatic && !finalAttrs.dontBuild;