diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2011-08-31 21:11:50 +0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2011-08-31 21:11:50 +0000 |
| commit | 93227ff65c73e726c4ceef0cdd9439e7a4301417 (patch) | |
| tree | ba7b60ca132c373913dd4a1c42a900009aeb8a77 /src/libstore/store-api.hh | |
| parent | 5bcdc7e3517e6d679cad1aaba41e4deb76d5a6e7 (diff) | |
* Eliminate all uses of the global variable ‘store’ from libstore.
This should also fix:
nix-instantiate: ./../boost/shared_ptr.hpp:254: T* boost::shared_ptr<T>::operator->() const [with T = nix::StoreAPI]: Assertion `px != 0' failed.
which was caused by hashDerivationModulo() calling the ‘store’
object (during store upgrades) before openStore() assigned it.
Diffstat (limited to 'src/libstore/store-api.hh')
| -rw-r--r-- | src/libstore/store-api.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh index 243a6324c..b3e67436c 100644 --- a/src/libstore/store-api.hh +++ b/src/libstore/store-api.hh @@ -314,13 +314,13 @@ void removeTempRoots(); /* Register a permanent GC root. */ -Path addPermRoot(const Path & storePath, const Path & gcRoot, - bool indirect, bool allowOutsideRootsDir = false); +Path addPermRoot(StoreAPI & store, const Path & storePath, + const Path & gcRoot, bool indirect, bool allowOutsideRootsDir = false); /* Sort a set of paths topologically under the references relation. If p refers to q, then p follows q in this list. */ -Paths topoSortPaths(const PathSet & paths); +Paths topoSortPaths(StoreAPI & store, const PathSet & paths); /* For now, there is a single global store API object, but we'll |