From b51ecc02c834eed67f45e943519e6e522b7185ae Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 23 Jan 2020 17:38:07 +0100
Subject: 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)
---
 src/libstore/build.cc | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

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");
 }
 
 
-- 
cgit 1.4.1