From 307eea8e2702b8e42c04030055180b984bb44ce2 Mon Sep 17 00:00:00 2001 From: sterni Date: Wed, 19 Jan 2022 13:56:52 +0100 Subject: fix(nix/buildLisp): use filtered deps for native deps in testSuite allDeps filters the lisp deps according to the given implementation, processing any implementation conditional attribute sets. These are not understood by allNative, so we need to pass it the already filtered input or evaluation would fail. Change-Id: I9eb2d0c3b2bf70d759d03490cf31fc585283ce7f Reviewed-on: https://cl.tvl.fyi/c/depot/+/5001 Reviewed-by: sterni Reviewed-by: tazjin Autosubmit: sterni Tested-by: BuildkiteCI --- nix/buildLisp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/buildLisp/default.nix b/nix/buildLisp/default.nix index c44e84189442..442ac7dfe14f 100644 --- a/nix/buildLisp/default.nix +++ b/nix/buildLisp/default.nix @@ -167,8 +167,8 @@ let # and then executes expression to check its result testSuite = { name, expression, srcs, deps ? [], native ? [], implementation }: let - lispNativeDeps = allNative native deps; lispDeps = allDeps implementation (implFilter implementation deps); + lispNativeDeps = allNative native lispDeps; filteredSrcs = implFilter implementation srcs; in runCommandNoCC name { LD_LIBRARY_PATH = lib.makeLibraryPath lispNativeDeps; -- cgit 1.4.1