about summary refs log tree commit diff
path: root/nix/buildLisp
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2022-01-19T12·56+0100
committersterni <sternenseemann@systemli.org>2022-01-19T13·07+0000
commit307eea8e2702b8e42c04030055180b984bb44ce2 (patch)
treeb69cef66cc4e07621e0ff25717b5f28ae46f1305 /nix/buildLisp
parent6e4b0f3cef56443a9780c4ff73466556e4915513 (diff)
fix(nix/buildLisp): use filtered deps for native deps in testSuite r/3634
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 <sternenseemann@systemli.org>
Reviewed-by: tazjin <tazjin@tvl.su>
Autosubmit: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
Diffstat (limited to 'nix/buildLisp')
-rw-r--r--nix/buildLisp/default.nix2
1 files changed, 1 insertions, 1 deletions
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;