aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2020-01-23 17:38:07 +0100
committerRobin Gloster <mail@glob.in>2020-01-23 17:38:07 +0100
commitf8dbde0813c4e8beed6dfd09b093589e027a6675 (patch)
treebcef350775c540a04815f8cf3b3384cb65c8ea23
parentd506bd587aa62dfa9e70f5ba87dd614f7286fe2d (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 '.'.
-rw-r--r--src/libstore/build.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 74a68e1f5..9c6aedfa5 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -2579,6 +2579,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 -
@@ -2647,6 +2648,7 @@ void DerivationGoal::writeStructuredAttrs()
}
writeFile(tmpDir + "/.attrs.sh", rewriteStrings(jsonSh, inputRewrites));
+ chownToBuilder(tmpDir + "/.attrs.sh");
}