diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-08-28 20:38:25 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-08-28 20:38:25 +0000 |
| commit | 48e8828050e5cd77a1aad067e00fdffe5a4a8015 (patch) | |
| tree | 7aebe4c772d6762394885211601533ef0538343e /src/libstore/derivations.hh | |
| parent | 8eb73a87245acf9d93dc401831b629981864fa58 (diff) | |
| parent | 8017fe7487ff545ac7be68bd7b339fffffa12b8f (diff) | |
Merge remote-tracking branch 'obsidian/single-ca-drv-build' into ca-floating-upstream
Diffstat (limited to 'src/libstore/derivations.hh')
| -rw-r--r-- | src/libstore/derivations.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstore/derivations.hh b/src/libstore/derivations.hh index 0bb565e8a..e4d85aa05 100644 --- a/src/libstore/derivations.hh +++ b/src/libstore/derivations.hh @@ -149,7 +149,7 @@ StorePath writeDerivation(Store & store, const Derivation & drv, RepairFlag repair = NoRepair); /* Read a derivation from a file. */ -Derivation readDerivation(const Store & store, const Path & drvPath, std::string_view name); +Derivation parseDerivation(const Store & store, std::string && s, std::string_view name); // FIXME: remove bool isDerivation(const string & fileName); |