diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-08-09 20:32:35 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-08-10 01:35:59 +0000 |
| commit | bcd0629c2e499788e4b3a9d6e380143a8f807419 (patch) | |
| tree | 9ef24cb730b406de397b11e31acc6b4a09197503 /src/libstore | |
| parent | edfd676e059578fb574ce78d1a2cc66d018d3b16 (diff) | |
Remove name parameter from `writeDerivation`
The name is now stored with the derivation itself.
Diffstat (limited to 'src/libstore')
| -rw-r--r-- | src/libstore/derivations.cc | 4 | ||||
| -rw-r--r-- | src/libstore/derivations.hh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libstore/derivations.cc b/src/libstore/derivations.cc index 68b081058..f7e764a80 100644 --- a/src/libstore/derivations.cc +++ b/src/libstore/derivations.cc @@ -62,7 +62,7 @@ bool BasicDerivation::isBuiltin() const StorePath writeDerivation(ref<Store> store, - const Derivation & drv, std::string_view name, RepairFlag repair) + const Derivation & drv, RepairFlag repair) { auto references = drv.inputSrcs; for (auto & i : drv.inputDrvs) @@ -70,7 +70,7 @@ StorePath writeDerivation(ref<Store> store, /* Note that the outputs of a derivation are *not* references (that can be missing (of course) and should not necessarily be held during a garbage collection). */ - auto suffix = std::string(name) + drvExtension; + auto suffix = std::string(drv.name) + drvExtension; auto contents = drv.unparse(*store, false); return settings.readOnlyMode ? store->computeStorePathForText(suffix, contents, references) diff --git a/src/libstore/derivations.hh b/src/libstore/derivations.hh index 14e0e947a..53dfc7f13 100644 --- a/src/libstore/derivations.hh +++ b/src/libstore/derivations.hh @@ -128,7 +128,7 @@ enum RepairFlag : bool { NoRepair = false, Repair = true }; /* Write a derivation to the Nix store, and return its path. */ StorePath writeDerivation(ref<Store> store, - const Derivation & drv, std::string_view name, RepairFlag repair = NoRepair); + const Derivation & drv, RepairFlag repair = NoRepair); /* Read a derivation from a file. */ Derivation readDerivation(const Store & store, const Path & drvPath, std::string_view name); |