guiwf/lix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8053 from DeterminateSystems/fix-structuredattrs-sandbox

Browse Source 
LocalDerivationGoal: set NIX_ATTRS_*_FILE correctly for sandboxed builds
This commit is contained in:
Eelco Dolstra
2023-03-16 16:04:30 +01:00
committed by GitHub
parent eb56cb7cc7 af4cbdafe7
commit 581e11cd55
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstore/build/local-derivation-goal.cc
+2 -2
View File
@@ -1154,10 +1154,10 @@ void LocalDerivationGoal::writeStructuredAttrs()
writeFile(tmpDir + "/.attrs.sh", rewriteStrings(jsonSh, inputRewrites));
chownToBuilder(tmpDir + "/.attrs.sh");
env["NIX_ATTRS_SH_FILE"] = tmpDir + "/.attrs.sh";
env["NIX_ATTRS_SH_FILE"] = tmpDirInSandbox + "/.attrs.sh";
writeFile(tmpDir + "/.attrs.json", rewriteStrings(json.dump(), inputRewrites));
chownToBuilder(tmpDir + "/.attrs.json");
env["NIX_ATTRS_JSON_FILE"] = tmpDir + "/.attrs.json";
env["NIX_ATTRS_JSON_FILE"] = tmpDirInSandbox + "/.attrs.json";
}
}