3 files changed, 24 insertions, 5 deletions
diff --git a/tvix/glue/src/builtins/import.rs b/tvix/glue/src/builtins/import.rs
index fd791b8091fd..2f02cd6ebbcd 100644
--- a/tvix/glue/src/builtins/import.rs
+++ b/tvix/glue/src/builtins/import.rs
@@ -123,6 +123,7 @@ mod import_builtins {
     use nix_compat::nixhash::{CAHash, NixHash};
     use tvix_eval::generators::Gen;
     use tvix_eval::{generators::GenCo, ErrorKind, Value};
+    use tvix_eval::{NixContextElement, NixString};
 
     use tvix_castore::B3Digest;
 
@@ -242,7 +243,13 @@ mod import_builtins {
             Ok::<_, std::io::Error>(state.path_info_service.as_ref().put(path_info).await?)
         })?;
 
-        Ok(output_path.to_absolute_path().into())
+        // We need to attach context to the final output path.
+        let outpath = output_path.to_absolute_path();
+
+        Ok(
+            NixString::new_context_from(NixContextElement::Plain(outpath.clone()).into(), outpath)
+                .into(),
+        )
     }
 
     #[builtin("filterSource")]
@@ -256,7 +263,7 @@ mod import_builtins {
         let root_node = filtered_ingest(Rc::clone(&state), co, &p, Some(&filter)).await?;
         let name = tvix_store::import::path_to_name(&p)?;
 
-        Ok(state
+        let outpath = state
             .tokio_handle
             .block_on(async {
                 let (_, nar_sha256) = state
@@ -278,8 +285,12 @@ mod import_builtins {
                 path: Some(p.to_path_buf()),
                 error: err.into(),
             })?
-            .to_absolute_path()
-            .into())
+            .to_absolute_path();
+
+        Ok(
+            NixString::new_context_from(NixContextElement::Plain(outpath.clone()).into(), outpath)
+                .into(),
+        )
     }
 }
 
diff --git a/tvix/glue/src/tests/tvix_tests/eval-okay-context-propagation.exp b/tvix/glue/src/tests/tvix_tests/eval-okay-context-propagation.exp
index 71c6ded40612..8bb828e36a42 100644
--- a/tvix/glue/src/tests/tvix_tests/eval-okay-context-propagation.exp
+++ b/tvix/glue/src/tests/tvix_tests/eval-okay-context-propagation.exp
@@ -1 +1 @@
-[ true true true true true true true true true true true true true true true true true true true true true true true true true true ]
+[ true true true true true true true true true true true true true true true true true true true true true true true true true true true true ]
diff --git a/tvix/glue/src/tests/tvix_tests/eval-okay-context-propagation.nix b/tvix/glue/src/tests/tvix_tests/eval-okay-context-propagation.nix
index 67f0ac46729b..918061b8b861 100644
--- a/tvix/glue/src/tests/tvix_tests/eval-okay-context-propagation.nix
+++ b/tvix/glue/src/tests/tvix_tests/eval-okay-context-propagation.nix
@@ -12,6 +12,11 @@ let
     system = "x86_64-linux";
     outputs = [ "out" "bar" ];
   };
+  a-path-drv = builtins.path {
+    name = "a-path-drv";
+    path = ./eval-okay-context-introspection.nix;
+  };
+  another-path-drv = builtins.filterSource (_: true) ./eval-okay-context-introspection.nix;
 
   # `substr` propagates context, we truncate to an empty string and concatenate to the target
   # to infect it with the context of `copied`.
@@ -37,6 +42,9 @@ in
   (builtins.hasContext "${(builtins.toFile "myself" "${./eval-okay-context-introspection.nix}")}")
   # `derivation` should produce context.
   (builtins.hasContext "${drv}")
+  # `builtins.path` / `builtins.filterSource` should produce context.
+  (builtins.hasContext "${a-path-drv}")
+  (builtins.hasContext "${another-path-drv}")
   # Low-level test to ensure that interpolation is working as expected.
   (builtins.length (builtins.attrNames (builtins.getContext "${drv}${other-drv}")) == 2)
   (builtins.getContext "${drv}${other-drv}" == mergeContext drv other-drv)