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

2020-07-17 10:28:33 -04:00
parent 745a03cef5 bf9f040112
commit 5cb840541b
6 changed files with 1895 additions and 38 deletions
@@ -135,7 +135,7 @@ StorePath getDerivationEnvironment(ref<Store> store, const StorePath & drvPath)
    drv.env["_outputs_saved"] = drv.env["outputs"];
    drv.env["outputs"] = "out";
    drv.inputSrcs.insert(std::move(getEnvShPath));
-    Hash h = hashDerivationModulo(*store, drv, true);
+    Hash h = std::get<0>(hashDerivationModulo(*store, drv, true));
    auto shellOutPath = store->makeOutputPath("out", h, drvName);
    drv.outputs.insert_or_assign("out", DerivationOutput { .output = DerivationOutputInputAddressed {
                .path = shellOutPath