aboutsummaryrefslogtreecommitdiff
path: root/src/libexpr
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2020-02-02 12:29:53 +0100
committerEelco Dolstra <edolstra@gmail.com>2020-02-02 12:29:53 +0100
commitfad9faf3545f115e33e522eb11802e2825c8c425 (patch)
tree47b05ccb2b5730a71b5ce70b8e70b9689ef92044 /src/libexpr
parent7bcc9f2aaf87a08a7570610f45e99754fd74d3f6 (diff)
Add TreeInfo::computeStorePath()
Diffstat (limited to 'src/libexpr')
-rw-r--r--src/libexpr/flake/lockfile.cc3
-rw-r--r--src/libexpr/flake/lockfile.hh2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/libexpr/flake/lockfile.cc b/src/libexpr/flake/lockfile.cc
index 6a64f113e..3d796eadc 100644
--- a/src/libexpr/flake/lockfile.cc
+++ b/src/libexpr/flake/lockfile.cc
@@ -111,8 +111,7 @@ nlohmann::json LockedInput::toJson() const
StorePath LockedInput::computeStorePath(Store & store) const
{
- assert(info.narHash);
- return store.makeFixedOutputPath(true, info.narHash, "source");
+ return info.computeStorePath(store);
}
LockedInputs::LockedInputs(const nlohmann::json & json)
diff --git a/src/libexpr/flake/lockfile.hh b/src/libexpr/flake/lockfile.hh
index 6333a6875..6203c40cb 100644
--- a/src/libexpr/flake/lockfile.hh
+++ b/src/libexpr/flake/lockfile.hh
@@ -11,6 +11,8 @@ struct StorePath;
namespace nix::flake {
+using namespace fetchers;
+
typedef std::vector<FlakeId> InputPath;
struct LockedInput;