fix(3p/nix): passAsFile: leave out the hash prefix r/876

Having a colon in the path may cause issues, and having the hash
function indicated isn't actually necessary. We now verify the path
format in the tests to prevent regressions.

(cherry picked from commit c65a6fa86aef7bdf51fb4fba7bd31d265619ba3f)

2 files changed, 2 insertions, 1 deletions

diff --git a/third_party/nix/src/libstore/build.cc b/third_party/nix/src/libstore/build.cc
index e7a9ea45e6eb..dcc3c7edc7af 100644
--- a/third_party/nix/src/libstore/build.cc
+++ b/third_party/nix/src/libstore/build.cc
@@ -2490,7 +2490,7 @@ void DerivationGoal::initTmpDir() {
         env[i.first] = i.second;
       } else {
         auto hash = hashString(htSHA256, i.first);
-        std::string fn = ".attr-" + hash.to_string();
+        std::string fn = ".attr-" + hash.to_string(Base32, false);
         Path p = tmpDir + "/" + fn;
         writeFile(p, rewriteStrings(i.second, inputRewrites));
         chownToBuilder(p);
diff --git a/third_party/nix/tests/pass-as-file.sh b/third_party/nix/tests/pass-as-file.sh
index 3dfe10baa235..2c0bc5031ad7 100644
--- a/third_party/nix/tests/pass-as-file.sh
+++ b/third_party/nix/tests/pass-as-file.sh
@@ -10,6 +10,7 @@ mkDerivation {
   passAsFile = [ \"foo\" ];
   foo = [ \"xyzzy\" ];
   builder = builtins.toFile \"builder.sh\" ''
+    [ \"\$(basename \$fooPath)\" = .attr-1bp7cri8hplaz6hbz0v4f0nl44rl84q1sg25kgwqzipzd1mv89ic ]
     [ \"\$(cat \$fooPath)\" = xyzzy ]
     touch \$out
   '';