diff options
author | Peter Kolloch <info@eigenvalue.net> | 2024-02-21T11·31+0700 |
---|---|---|
committer | clbot <clbot@tvl.fyi> | 2024-02-21T11·38+0000 |
commit | fde488ec6dc444561ae353f979d87c8ae87261fb (patch) | |
tree | c9b673d9d0fc19709f61c88ceb59092f11d7facd /tvix/glue/src/builtins/derivation.rs | |
parent | 035f617b7f11f2ec4a9e08e3a31a175e71a6544b (diff) |
feat(tvix/nix-compat): Use `StorePath` in `Output` r/7585
https: //b.tvl.fyi/issues/264 Change-Id: Icb09be9643245cc68d09f01d7723af2d44d6bd1a Reviewed-on: https://cl.tvl.fyi/c/depot/+/11001 Autosubmit: Peter Kolloch <info@eigenvalue.net> Reviewed-by: flokli <flokli@flokli.de> Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/glue/src/builtins/derivation.rs')
-rw-r--r-- | tvix/glue/src/builtins/derivation.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tvix/glue/src/builtins/derivation.rs b/tvix/glue/src/builtins/derivation.rs index 87ae8bb946bd..b597d20211e9 100644 --- a/tvix/glue/src/builtins/derivation.rs +++ b/tvix/glue/src/builtins/derivation.rs @@ -116,7 +116,7 @@ fn handle_fixed_output( drv.outputs.insert( "out".to_string(), Output { - path: "".to_string(), + path: None, ca_hash: match hash_mode_str.as_deref() { None | Some("flat") => Some(nixhash::CAHash::Flat(nixhash)), Some("recursive") => Some(nixhash::CAHash::Nar(nixhash)), @@ -486,7 +486,7 @@ pub(crate) mod derivation_builtins { ( name.clone(), ( - output.path, + output.path.unwrap().to_absolute_path(), Some( NixContextElement::Single { name, |