From 581fc477838e9cf9e5d9657920ef63ea836050ee Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 25 Jan 2005 11:55:43 +0000 Subject: * Fix the build hook mechanism; pass the pointer graph to the hook. --- tests/build-hook.hook.sh | 4 ++-- tests/build-hook.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tests') 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" -- cgit 1.4.1