about summary refs log tree commit diff
path: root/tvix/eval/src/vm
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2023-03-04T00·52+0300
committertazjin <tazjin@tvl.su>2023-03-13T20·30+0000
commit43b0416bd8b5c4c7c99b146f8cee7b1a979a7782 (patch)
tree14273929a1160e142f0a6a2a3569c5cbbe274f4d /tvix/eval/src/vm
parenta59e264457f030fedf63c6d2925c896d6790d390 (diff)
fix(tvix/eval): more closely line up path resolution with cppnix r/5982
... 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
Diffstat (limited to 'tvix/eval/src/vm')
-rw-r--r--tvix/eval/src/vm/mod.rs5
1 files changed, 4 insertions, 1 deletions
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());
                     }