Merge branch 'multi-output-hashDerivationModulo' of github.com:Ericson2314/nix into misc-ca

1 files changed, 3 insertions, 1 deletions

diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index ebe31724c..d12d571ad 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -800,7 +800,9 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
                 });
         }
 
-        Hash h = hashDerivationModulo(*state.store, Derivation(drv), true);
+        // Regular, non-CA derivation should always return a single hash and not
+        // hash per output.
+        Hash h = std::get<0>(hashDerivationModulo(*state.store, Derivation(drv), true));
 
         for (auto & i : outputs) {
             auto outPath = state.store->makeOutputPath(i, h, drvName);