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/nix-compat/src/derivation/mod.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/nix-compat/src/derivation/mod.rs')
| -rw-r--r-- | tvix/nix-compat/src/derivation/mod.rs | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/tvix/nix-compat/src/derivation/mod.rs b/tvix/nix-compat/src/derivation/mod.rs index 2e4178b872..7c5afdbdcf 100644 --- a/tvix/nix-compat/src/derivation/mod.rs +++ b/tvix/nix-compat/src/derivation/mod.rs @@ -161,7 +161,13 @@ impl Derivation { "fixed:out:{}{}:{}", ca_kind_prefix(ca_hash), ca_hash.digest().to_nix_hex_string(), - out_output.path + out_output + .path + .as_ref() + .map(StorePath::to_absolute_path) + .as_ref() + .map(|s| s as &str) + .unwrap_or(""), )) .finalize() .into(), @@ -239,7 +245,7 @@ impl Derivation { // Assert that outputs are not yet populated, to avoid using this function wrongly. // We don't also go over self.environment, but it's a sufficient // footgun prevention mechanism. - assert!(output.path.is_empty()); + assert!(output.path.is_none()); let path_name = output_path_name(name, output_name); @@ -258,7 +264,7 @@ impl Derivation { })? }; - output.path = abs_store_path.to_absolute_path(); + output.path = Some(abs_store_path.to_owned()); self.environment.insert( output_name.to_string(), abs_store_path.to_absolute_path().into(), |