From ff762fb499be220ccd680f3bf68dca44a902a5ff Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 3 Dec 2008 16:10:17 +0000 Subject: * Pass HashType values instead of strings. --- src/libexpr/primops.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/libexpr') diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index 657c3bf71ba7..7d179da8ec12 100644 --- a/src/libexpr/primops.cc +++ b/src/libexpr/primops.cc @@ -400,7 +400,7 @@ static Expr prim_derivationStrict(EvalState & state, const ATermVector & args) % outputHash % outputHashAlgo); string s = outputHash; outputHash = printHash(h); - outPath = makeFixedOutputPath(outputHashRecursive, outputHashAlgo, h, drvName); + outPath = makeFixedOutputPath(outputHashRecursive, ht, h, drvName); if (outputHashRecursive) outputHashAlgo = "r:" + outputHashAlgo; } @@ -634,8 +634,8 @@ static Expr prim_filterSource(EvalState & state, const ATermVector & args) FilterFromExpr filter(state, args[0]); Path dstPath = readOnlyMode - ? computeStorePathForPath(path, true, "sha256", filter).first - : store->addToStore(path, true, "sha256", filter); + ? computeStorePathForPath(path, true, htSHA256, filter).first + : store->addToStore(path, true, htSHA256, filter); return makeStr(dstPath, singleton(dstPath)); } -- cgit 1.4.1