aboutsummaryrefslogtreecommitdiff
path: root/src/libstore/derivations.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/libstore/derivations.cc')
-rw-r--r--src/libstore/derivations.cc16
1 files changed, 1 insertions, 15 deletions
diff --git a/src/libstore/derivations.cc b/src/libstore/derivations.cc
index 74b861281..3961126ff 100644
--- a/src/libstore/derivations.cc
+++ b/src/libstore/derivations.cc
@@ -36,12 +36,6 @@ Path BasicDerivation::findOutput(const string & id) const
}
-bool BasicDerivation::willBuildLocally() const
-{
- return get(env, "preferLocalBuild") == "1" && canBuildLocally();
-}
-
-
bool BasicDerivation::substitutesAllowed() const
{
return get(env, "allowSubstitutes", "1") == "1";
@@ -54,14 +48,6 @@ bool BasicDerivation::isBuiltin() const
}
-bool BasicDerivation::canBuildLocally() const
-{
- return platform == settings.thisSystem
- || settings.extraPlatforms.get().count(platform) > 0
- || isBuiltin();
-}
-
-
Path writeDerivation(ref<Store> store,
const Derivation & drv, const string & name, RepairFlag repair)
{
@@ -342,7 +328,7 @@ Hash hashDerivationModulo(Store & store, Derivation drv)
Hash h = drvHashes[i.first];
if (!h) {
assert(store.isValidPath(i.first));
- Derivation drv2 = readDerivation(i.first);
+ Derivation drv2 = readDerivation(store.toRealPath(i.first));
h = hashDerivationModulo(store, drv2);
drvHashes[i.first] = h;
}