From 17b7fb383f04b792b5709e2ed497330c7962c6a3 Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman Date: Thu, 16 Oct 2025 01:04:26 +0300 Subject: [PATCH] tests: Fix splicing in functional tests for nix-cli This is necessary to fix nix-everything-llvm. The problem here is that nix-cli is taken from the previous stage that is built with libstdc++, but this derivation builds plugins with libc++ and the plugin load fails miserably. --- tests/functional/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/functional/package.nix b/tests/functional/package.nix index a36c2e2d3..6830a9e58 100644 --- a/tests/functional/package.nix +++ b/tests/functional/package.nix @@ -60,7 +60,10 @@ mkMesonDerivation ( ]; nativeBuildInputs = finalAttrs.passthru.externalNativeBuildInputs ++ [ - nix-cli + # Explicitly splice the hostHost variant to fix LLVM tests. The nix-cli + # has to be in PATH, but must come from the host context where it's built + # with libc++. + (nix-cli.__spliced.hostHost or nix-cli) ]; buildInputs = [