diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2017-08-31T12·28+0200 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2017-08-31T12·28+0200 |
commit | c2154d4c8422ddc1c201d503bb52edff854af2ad (patch) | |
tree | 46b01c4081ef1ba5c16bf3b739218cbdbee1ebd6 /src/libstore/build.cc | |
parent | 7d4a7136dba7ceb3d5b080b092eb76d23e2bb549 (diff) |
Rename a few configuration options
In particular, drop the "build-" and "gc-" prefixes which are pointless. So now you can say nix build --no-sandbox instead of nix build --no-build-use-sandbox
Diffstat (limited to 'src/libstore/build.cc')
-rw-r--r-- | src/libstore/build.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc index 02dcd4536a5c..39f6128aafd6 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -1740,11 +1740,11 @@ void DerivationGoal::startBuilder() if (settings.sandboxMode == smEnabled) { if (get(drv->env, "__noChroot") == "1") throw Error(format("derivation '%1%' has '__noChroot' set, " - "but that's not allowed when 'build-use-sandbox' is 'true'") % drvPath); + "but that's not allowed when 'sandbox' is 'true'") % drvPath); #if __APPLE__ if (additionalSandboxProfile != "") throw Error(format("derivation '%1%' specifies a sandbox profile, " - "but this is only allowed when 'build-use-sandbox' is 'relaxed'") % drvPath); + "but this is only allowed when 'sandbox' is 'relaxed'") % drvPath); #endif useChroot = true; } @@ -1832,7 +1832,7 @@ void DerivationGoal::startBuilder() worker.store.computeFSClosure(worker.store.toStorePath(i.second.source), closure); } catch (InvalidPath & e) { } catch (Error & e) { - throw Error(format("while processing 'build-sandbox-paths': %s") % e.what()); + throw Error(format("while processing 'sandbox-paths': %s") % e.what()); } for (auto & i : closure) dirsInChroot[i] = i; |