maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(tvix/eval): more closely line up path resolution with cppnix

Browse source 
... 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 <tvl@lahfa.xyz>
Tested-by: BuildkiteCI
This commit is contained in:
Vincent Ambo 2023-03-04 03:52:47 +03:00 • committed by tazjin
parent a59e264457
commit 43b0416bd8
2 changed files with 51 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tvix/eval/src/vm/mod.rs
View file

@ -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());
}