feat(tvix/nix-compat/derivation): make use of NixPath in some places r/5882

Some of these strings are actually just the nix hash representation of
the hash calculated earlier.

There's another one passed around via calculate_drv_replacement_str, but
that's left for a followup.

Change-Id: Id99a2a926a980d679eb49c34ee6a36bf224699b0
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8218
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
Autosubmit: flokli <flokli@flokli.de>

1 files changed, 5 insertions, 2 deletions

diff --git a/tvix/nix-compat/src/derivation/utils.rs b/tvix/nix-compat/src/derivation/utils.rs
index 77ac94b42462..cbb5d02a2180 100644
--- a/tvix/nix-compat/src/derivation/utils.rs
+++ b/tvix/nix-compat/src/derivation/utils.rs
@@ -1,5 +1,6 @@
 use crate::derivation::DerivationError;
 use crate::nixbase32;
+use crate::nixhash::NixHash;
 use crate::store_path::{self, StorePath};
 use sha2::{Digest, Sha256};
 
@@ -67,9 +68,11 @@ pub fn path_with_references<S: AsRef<str>, I: IntoIterator<Item = S>, C: AsRef<[
         hasher.finalize()
     };
 
+    let h = NixHash::new(crate::nixhash::HashAlgo::Sha256, content_digest.to_vec());
+
     s.push_str(&format!(
-        ":sha256:{:x}:{}:{}",
-        content_digest,
+        ":{}:{}:{}",
+        h.to_nix_hash_string(),
         store_path::STORE_DIR,
         name
     ));