diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-06-19 15:18:19 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-06-19 15:26:59 +0000 |
| commit | 2f0e395c99f926b9f0a65e37ea644a40ec5dddfa (patch) | |
| tree | f9d8d6e0ae6e4b945f296484358d84e889a2ef11 /src/nix/develop.cc | |
| parent | 3fc58a96387f55226ad78a0d8e765a0f041e8da0 (diff) | |
| parent | fb39a5e00c03c8fb3b893263e1d2b151c3ba11aa (diff) | |
Merge remote-tracking branch 'me/no-stringly-typed-derivation-output' into validPathInfo-ca-proper-datatype
Diffstat (limited to 'src/nix/develop.cc')
| -rw-r--r-- | src/nix/develop.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/nix/develop.cc b/src/nix/develop.cc index 8abb710c2..037987313 100644 --- a/src/nix/develop.cc +++ b/src/nix/develop.cc @@ -137,8 +137,9 @@ StorePath getDerivationEnvironment(ref<Store> store, const StorePath & drvPath) auto shellOutPath = store->makeOutputPath("out", h, drvName); drv.outputs.insert_or_assign("out", DerivationOutput { .path = shellOutPath, - .hash = FileSystemHash { - FileIngestionMethod::Flat, Hash { } + .hash = FixedOutputHash { + .method = FileIngestionMethod::Flat, + .hash = Hash { }, }, }); drv.env["out"] = store->printStorePath(shellOutPath); |