diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-09-15 15:21:39 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-09-15 15:21:39 +0000 |
| commit | 3a5cdd737cf529a7f641c4347f002b821a456a5d (patch) | |
| tree | 7153276cf71c5212ffdfa375f43d075d9dadcadf /src/libexpr | |
| parent | 6387550d58884ac09204c339ed3a3cd700780a75 (diff) | |
Rename `Derivation::pathOpt` to `Derivation::path`
We no longer need the `*Opt` to disambiguate.
Diffstat (limited to 'src/libexpr')
| -rw-r--r-- | src/libexpr/get-drvs.cc | 2 | ||||
| -rw-r--r-- | src/libexpr/primops.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libexpr/get-drvs.cc b/src/libexpr/get-drvs.cc index e66832182..91916e8bf 100644 --- a/src/libexpr/get-drvs.cc +++ b/src/libexpr/get-drvs.cc @@ -40,7 +40,7 @@ DrvInfo::DrvInfo(EvalState & state, ref<Store> store, const std::string & drvPat throw Error("derivation '%s' does not have output '%s'", store->printStorePath(drvPath), outputName); auto & [outputName, output] = *i; - auto optStorePath = output.pathOpt(*store, drv.name, outputName); + auto optStorePath = output.path(*store, drv.name, outputName); if (optStorePath) outPath = store->printStorePath(*optStorePath); } diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index 78dc314fa..4a0dd5544 100644 --- a/src/libexpr/primops.cc +++ b/src/libexpr/primops.cc @@ -91,7 +91,7 @@ static void mkOutputString(EvalState & state, Value & v, const StorePath & drvPath, const BasicDerivation & drv, std::pair<string, DerivationOutput> o) { - auto optOutputPath = o.second.pathOpt(*state.store, drv.name, o.first); + auto optOutputPath = o.second.path(*state.store, drv.name, o.first); mkString( *state.allocAttr(v, state.symbols.create(o.first)), optOutputPath |