* Fix the build hook mechanism; pass the pointer graph to the hook.

3 files changed, 27 insertions, 5 deletions

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 8d9946add4..1de50a1404 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -769,15 +769,20 @@ DerivationGoal::HookReply DerivationGoal::tryBuildHook()
         
         /* Write the information that the hook needs to perform the
            build, i.e., the set of input paths, the set of output
-           paths, and [!!!]. */
+           paths, and the references (pointer graph) in the input
+           paths. */
         
         Path inputListFN = tmpDir + "/inputs";
         Path outputListFN = tmpDir + "/outputs";
+        Path referencesFN = tmpDir + "/references";
 
         string s;
         for (PathSet::iterator i = inputPaths.begin();
              i != inputPaths.end(); ++i)
             s += *i + "\n";
+        for (DerivationInputs::iterator i = drv.inputDrvs.begin();
+             i != drv.inputDrvs.end(); ++i)
+            s += i->first + "\n";
         writeStringToFile(inputListFN, s);
         
         s = "";
@@ -785,7 +790,24 @@ DerivationGoal::HookReply DerivationGoal::tryBuildHook()
              i != drv.outputs.end(); ++i)
             s += i->second.path + "\n";
         writeStringToFile(outputListFN, s);
-        
+
+        s = "";
+        for (PathSet::iterator i = inputPaths.begin();
+             i != inputPaths.end(); ++i)
+        {
+            s += *i;
+            PathSet references;
+            queryReferences(*i, references);
+            for (PathSet::iterator j = references.begin();
+                 j != references.end(); ++j)
+            {
+                s += " ";
+                s += *j;
+            }
+            s += "\n";
+        }
+        writeStringToFile(referencesFN, s);
+
         /* Tell the hook to proceed. */ 
         writeLine(toHook.writeSide, "okay");
 
diff --git a/tests/build-hook.hook.sh b/tests/build-hook.hook.sh
index bbf423017f..45536f8de3 100755
--- a/tests/build-hook.hook.sh
+++ b/tests/build-hook.hook.sh
@@ -1,12 +1,12 @@
 #! /bin/sh
 
-set -x
+#set -x
 
 drv=$4
 
 echo "HOOK for $drv" >&2
 
-outPath=$(sed 's/Derive(\[\"\([^\"]*\)\".*/\1/' $drv)
+outPath=$(sed 's/Derive(\[("out",\"\([^\"]*\)\".*/\1/' $drv)
 
 echo "output path is $outPath" >&2
 
diff --git a/tests/build-hook.sh b/tests/build-hook.sh
index 417f8c6d03..402ed83c96 100644
--- a/tests/build-hook.sh
+++ b/tests/build-hook.sh
@@ -4,7 +4,7 @@ storeExpr=$($TOP/src/nix-instantiate/nix-instantiate build-hook.nix)
 
 echo "store expr is $storeExpr"
 
-outPath=$($TOP/src/nix-store/nix-store -qnfvvvvv "$storeExpr")
+outPath=$($TOP/src/nix-store/nix-store -quf "$storeExpr")
 
 echo "output path is $outPath"