From 515c0a263e137a00e82f7d981284dbe54db23247 Mon Sep 17 00:00:00 2001
From: Puck Meerburg <puck@puck.moe>
Date: Thu, 2 Jan 2020 17:20:57 +0000
Subject: [PATCH] passAsFile: hash the attribute name instead of numbering
 sequentially

This makes the paths consistent without relying on ordering.

Co-authored-by: edef <edef@edef.eu>
---
 src/libstore/build.cc | 4 ++--
 1 file 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);