about summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2005-01-25T11·55+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2005-01-25T11·55+0000
commit581fc477838e9cf9e5d9657920ef63ea836050ee (patch)
treebac33c0720129205ed6baf25b12bbd9734946a90 /tests
parent52bf9b86bb79369b7f7b5b8a5726b83ee154da6a (diff)
* Fix the build hook mechanism; pass the pointer graph to the hook.
Diffstat (limited to 'tests')
-rwxr-xr-xtests/build-hook.hook.sh4
-rw-r--r--tests/build-hook.sh2
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/build-hook.hook.sh b/tests/build-hook.hook.sh
index bbf423017f18..45536f8de343 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 417f8c6d0300..402ed83c96cd 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"