diff options
author | Robin Gloster <mail@glob.in> | 2020-01-23T16·38+0100 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2020-02-18T15·45+0100 |
commit | b51ecc02c834eed67f45e943519e6e522b7185ae (patch) | |
tree | f072063c512611cbee2534fa96ac669b005ddb0c /src/libstore/build.cc | |
parent | ed25fdd66e35840e1c73f283bba0671747005572 (diff) |
structured-attrs: chown .attrs.* files to builder
Otherwise `chmod .`'ing the build directory doesn't work anymore, which is done in nixpkgs if sourceRoot is set to '.'. (cherry picked from commit f8dbde0813c4e8beed6dfd09b093589e027a6675)
Diffstat (limited to 'src/libstore/build.cc')
-rw-r--r-- | src/libstore/build.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc index d04513ddb8c4..3fd1a7b38ac0 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -2578,6 +2578,7 @@ void DerivationGoal::writeStructuredAttrs() } writeFile(tmpDir + "/.attrs.json", rewriteStrings(json.dump(), inputRewrites)); + chownToBuilder(tmpDir + "/.attrs.json"); /* As a convenience to bash scripts, write a shell file that maps all attributes that are representable in bash - @@ -2646,6 +2647,7 @@ void DerivationGoal::writeStructuredAttrs() } writeFile(tmpDir + "/.attrs.sh", rewriteStrings(jsonSh, inputRewrites)); + chownToBuilder(tmpDir + "/.attrs.sh"); } |