From 7850d3d27910c30232dd09dd86ee8afdaad26b90 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 1 Jun 2016 14:49:12 +0200
Subject: Make the store directory a member variable of Store

---
 src/nix/command.cc      | 2 +-
 src/nix/installables.cc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/nix')

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;
-- 
cgit 1.4.1