diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-06-19 14:47:10 +0000 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-06-19 14:47:10 +0000 |
commit | 237d88c97e1f08f8c1513261ac5fea847d5917ff (patch) | |
tree | 52b3e111b17395b5de1247ed4c37e093f85b48f2 /src/libexpr/primops.cc | |
parent | 517f5980e2c63af47e7042873cc33b521918ad35 (diff) |
FileSystemHash -> DerivationOutputHash
Diffstat (limited to 'src/libexpr/primops.cc')
-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 8288dd6a1..175fccf39 100644 --- a/src/libexpr/primops.cc +++ b/src/libexpr/primops.cc @@ -776,7 +776,7 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * * if (!jsonObject) drv.env["out"] = state.store->printStorePath(outPath); drv.outputs.insert_or_assign("out", DerivationOutput { .path = std::move(outPath), - .hash = FileSystemHash { ingestionMethod, std::move(h) }, + .hash = DerivationOutputHash { ingestionMethod, std::move(h) }, }); } @@ -792,7 +792,7 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * * drv.outputs.insert_or_assign(i, DerivationOutput { .path = StorePath::dummy, - .hash = std::optional<FileSystemHash> {}, + .hash = std::optional<DerivationOutputHash> {}, }); } @@ -804,7 +804,7 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * * drv.outputs.insert_or_assign(i, DerivationOutput { .path = std::move(outPath), - .hash = std::optional<FileSystemHash>(), + .hash = std::optional<DerivationOutputHash>(), }); } } |