diff options
author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2008-12-03T16·10+0000 |
---|---|---|
committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2008-12-03T16·10+0000 |
commit | ff762fb499be220ccd680f3bf68dca44a902a5ff (patch) | |
tree | 02f738ec60517e3eadd5b0a2bc2fe5c19c3d954c /src/libexpr | |
parent | 1307b222239da8e503d22ad9316789e30b4e2431 (diff) |
* Pass HashType values instead of strings.
Diffstat (limited to 'src/libexpr')
-rw-r--r-- | src/libexpr/primops.cc | 6 |
1 files changed, 3 insertions, 3 deletions
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<PathSet>(dstPath)); } |