From 064816ab98e7a230b6e9f4071353f5172e70cf03 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 2 Jun 2016 14:25:07 +0200
Subject: [PATCH] Respect build-use-substitutes

---
 src/libstore/build.cc       | 2 +-
 src/libstore/local-store.cc | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 9316c069e..f232fe86a 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -3107,7 +3107,7 @@ void SubstitutionGoal::init()
     if (settings.readOnlyMode)
         throw Error(format("cannot substitute path ‘%1%’ - no write access to the Nix store") % storePath);
 
-    subs = getDefaultSubstituters();
+    subs = settings.useSubstitutes ? getDefaultSubstituters() : std::list<ref<Store>>();
 
     tryNext();
 }
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index e1ff94d2c..1ffacc5b0 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -780,6 +780,7 @@ Path LocalStore::queryPathFromHashPart(const string & hashPart)
 
 PathSet LocalStore::querySubstitutablePaths(const PathSet & paths)
 {
+    if (!settings.useSubstitutes) return PathSet();
     PathSet res;
     for (auto & sub : getDefaultSubstituters()) {
         if (sub->storeDir != storeDir) continue;
@@ -799,6 +800,7 @@ PathSet LocalStore::querySubstitutablePaths(const PathSet & paths)
 void LocalStore::querySubstitutablePathInfos(const PathSet & paths,
     SubstitutablePathInfos & infos)
 {
+    if (!settings.useSubstitutes) return;
     for (auto & sub : getDefaultSubstituters()) {
         if (sub->storeDir != storeDir) continue;
         for (auto & path : paths) {