From 43b0416bd8b5c4c7c99b146f8cee7b1a979a7782 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sat, 4 Mar 2023 03:52:47 +0300 Subject: fix(tvix/eval): more closely line up path resolution with cppnix ... except now the tests fail, but at least it works Change-Id: I05e86c173f40533ae65548585c1ddaa200ac5235 Reviewed-on: https://cl.tvl.fyi/c/depot/+/8214 Reviewed-by: raitobezarius Tested-by: BuildkiteCI --- tvix/eval/src/vm/mod.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'tvix/eval/src/vm/mod.rs') diff --git a/tvix/eval/src/vm/mod.rs b/tvix/eval/src/vm/mod.rs index c3894472fd7a..9dc1728531e6 100644 --- a/tvix/eval/src/vm/mod.rs +++ b/tvix/eval/src/vm/mod.rs @@ -570,7 +570,10 @@ impl<'o> VM<'o> { OpCode::OpFindFile => match self.stack_pop() { Value::UnresolvedPath(path) => { - let resolved = self.nix_search_path.resolve(*path).with_span(&frame)?; + let resolved = self + .nix_search_path + .resolve(&*self.io_handle, *path) + .with_span(&frame)?; self.stack.push(resolved.into()); } -- cgit 1.4.1