mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(nix/buildLisp): use filtered deps for native deps in testSuite

Browse source 
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
This commit is contained in:
sterni 2022-01-19 13:56:52 +01:00
parent 6e4b0f3cef
commit 307eea8e27
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nix/buildLisp/default.nix
View file

@ -167,8 +167,8 @@ let
# and then executes expression to check its result # and then executes expression to check its result
testSuite = { name, expression, srcs, deps ? [], native ? [], implementation }: testSuite = { name, expression, srcs, deps ? [], native ? [], implementation }:
let let
lispNativeDeps = allNative native deps;
lispDeps = allDeps implementation (implFilter implementation deps); lispDeps = allDeps implementation (implFilter implementation deps);
lispNativeDeps = allNative native lispDeps;
filteredSrcs = implFilter implementation srcs; filteredSrcs = implFilter implementation srcs;
in runCommandNoCC name { in runCommandNoCC name {
LD_LIBRARY_PATH = lib.makeLibraryPath lispNativeDeps; LD_LIBRARY_PATH = lib.makeLibraryPath lispNativeDeps;