mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(3p/nix): passAsFile: hash the attribute name instead of numbering sequentially

Browse source 
This makes the paths consistent without relying on ordering.

Co-authored-by: edef <edef@edef.eu>
(cherry picked from commit 515c0a263e137a00e82f7d981284dbe54db23247)
This commit is contained in:
Puck Meerburg 2020-01-02 17:20:57 +00:00 committed by Vincent Ambo
parent 976b49f2ed
commit 7cc7fdacbe
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
third_party/nix/src/libstore/build.cc vendored
View file

@ -2485,12 +2485,12 @@ void DerivationGoal::initTmpDir() {
if (!parsedDrv->getStructuredAttrs()) {
std::set<std::string> passAsFile =
absl::StrSplit(get(drv->env, "passAsFile"), absl::ByAnyChar(" \t\n\r"));
int fileNr = 0;
for (auto& i : drv->env) {
if (passAsFile.find(i.first) == passAsFile.end()) {
env[i.first] = i.second;
} else {
std::string fn = ".attr-" + std::to_string(fileNr++);
auto hash = hashString(htSHA256, i.first);
std::string fn = ".attr-" + hash.to_string();
Path p = tmpDir + "/" + fn;
writeFile(p, rewriteStrings(i.second, inputRewrites));
chownToBuilder(p);