Merge pull request #3297 from edef1c/passasfile-hash

passAsFile: hash the attribute name instead of numbering sequentially

1 files changed, 2 insertions, 2 deletions

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 5d681d279..9ee3b04e3 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -2455,12 +2455,12 @@ void DerivationGoal::initTmpDir() {
     if (!parsedDrv->getStructuredAttrs()) {
 
         StringSet passAsFile = tokenizeString<StringSet>(get(drv->env, "passAsFile").value_or(""));
-        int fileNr = 0;
         for (auto & i : drv->env) {
             if (passAsFile.find(i.first) == passAsFile.end()) {
                 env[i.first] = i.second;
             } else {
-                string fn = ".attr-" + std::to_string(fileNr++);
+                auto hash = hashString(htSHA256, i.first);
+                string fn = ".attr-" + hash.to_string();
                 Path p = tmpDir + "/" + fn;
                 writeFile(p, i.second);
                 chownToBuilder(p);