diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-06-01T12·49+0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-06-01T14·24+0200 |
| commit | 7850d3d27910c30232dd09dd86ee8afdaad26b90 (patch) | |
| tree | da539f14d98d815e89b6ad60ed8e1e1ab9981cbf /src/nix | |
| parent | 1b5b654fe25cf7f2219ebe96a943397d683bfa0e (diff) | |
Make the store directory a member variable of Store
Diffstat (limited to 'src/nix')
| -rw-r--r-- | src/nix/command.cc | 2 | ||||
| -rw-r--r-- | src/nix/installables.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nix/command.cc b/src/nix/command.cc index 253c9686ba75..37534015b89f 100644 --- a/src/nix/command.cc +++ b/src/nix/command.cc @@ -102,7 +102,7 @@ void StorePathsCommand::run(ref<Store> store) else { for (auto & storePath : storePaths) - storePath = followLinksToStorePath(storePath); + storePath = store->followLinksToStorePath(storePath); if (recursive) { PathSet closure; diff --git a/src/nix/installables.cc b/src/nix/installables.cc index fb5a515825aa..6257c7679af9 100644 --- a/src/nix/installables.cc +++ b/src/nix/installables.cc @@ -17,7 +17,7 @@ UserEnvElems MixInstallables::evalInstallables(ref<Store> store) if (std::string(installable, 0, 1) == "/") { - if (isStorePath(installable)) { + if (store->isStorePath(installable)) { if (isDerivation(installable)) { UserEnvElem elem; |