* Support queryDeriver() in multi-user installations.

1 files changed, 8 insertions, 2 deletions

diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index cd8bc1a33..116533512 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -399,7 +399,7 @@ void setDeriver(const Transaction & txn, const Path & storePath,
 }
 
 
-Path queryDeriver(const Transaction & txn, const Path & storePath)
+static Path queryDeriver(const Transaction & txn, const Path & storePath)
 {
     if (!isRealisablePath(txn, storePath))
         throw Error(format("path `%1%' is not valid") % storePath);
@@ -411,6 +411,12 @@ Path queryDeriver(const Transaction & txn, const Path & storePath)
 }
 
 
+Path LocalStore::queryDeriver(const Path & path)
+{
+    return nix::queryDeriver(noTxn, path);
+}
+
+
 const int substituteVersion = 2;
 
 
@@ -756,7 +762,7 @@ void LocalStore::exportPath(const Path & path, bool sign,
     nix::queryReferences(txn, path, references);
     writeStringSet(references, hashAndWriteSink);
 
-    Path deriver = queryDeriver(txn, path);
+    Path deriver = nix::queryDeriver(txn, path);
     writeString(deriver, hashAndWriteSink);
 
     if (sign) {