diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2006-03-01 12:51:18 +0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2006-03-01 12:51:18 +0000 |
| commit | 84c4631221bc65643830173b4affe58b0dc58202 (patch) | |
| tree | 19093aff12bbb33e1b377a2fdec688965e42029e /tests/substitutes2.sh | |
| parent | a4c63c6e8e161d55778b797e566d9eca7c47f34f (diff) | |
* Simplification.
Diffstat (limited to 'tests/substitutes2.sh')
| -rw-r--r-- | tests/substitutes2.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/substitutes2.sh b/tests/substitutes2.sh index 7303255af..416e81536 100644 --- a/tests/substitutes2.sh +++ b/tests/substitutes2.sh @@ -1,15 +1,15 @@ source common.sh # Instantiate. -drvPath=$($TOP/src/nix-instantiate/nix-instantiate substitutes2.nix) +drvPath=$($nixinstantiate substitutes2.nix) echo "derivation is $drvPath" # Find the output path. -outPath=$($TOP/src/nix-store/nix-store -qvvvvv "$drvPath") +outPath=$($nixstore -qvvvvv "$drvPath") echo "output path is $outPath" regSub() { - (echo $1 && echo "" && echo $2 && echo 3 && echo $outPath && echo Hallo && echo Wereld && echo 0) | $TOP/src/nix-store/nix-store --register-substitutes + (echo $1 && echo "" && echo $2 && echo 3 && echo $outPath && echo Hallo && echo Wereld && echo 0) | $nixstore --register-substitutes } # Register a substitute for the output path. @@ -19,7 +19,7 @@ regSub $outPath $(pwd)/substituter.sh # precedence over the previous one. It will fail. regSub $outPath $(pwd)/substituter2.sh -$TOP/src/nix-store/nix-store -rvv "$drvPath" +$nixstore -rvv "$drvPath" text=$(cat "$outPath"/hello) if test "$text" != "Hallo Wereld"; then exit 1; fi |