lix-project/lix
20
58
Fork 31
Code Issues 359 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Add an option ‘build-fallback’ (equivalent to the --fallback flag)

Browse source
This commit is contained in:
Eelco Dolstra 2012-07-31 17:56:02 -04:00
parent 97421eb5ec
commit 89a8207029
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
doc/manual/conf-file.xml
View file

@ -246,6 +246,16 @@ flag, e.g. <literal>--option gc-keep-outputs false</literal>.</para>
</varlistentry> </varlistentry>
<varlistentry><term><literal>build-fallback</literal></term>
<listitem><para>If set to <literal>true</literal>, Nix will fall
back to building from source if a binary substitute fails. This
is equivalent to the <option>--fallback</option> flag. The
default is <literal>false</literal>.</para></listitem>
</varlistentry>
<varlistentry xml:id="conf-build-chroot-dirs"><term><literal>build-chroot-dirs</literal></term> <varlistentry xml:id="conf-build-chroot-dirs"><term><literal>build-chroot-dirs</literal></term>
<listitem><para>When builds are performed in a chroot environment, <listitem><para>When builds are performed in a chroot environment,

2
src/libmain/shared.cc
View file

@ -191,7 +191,7 @@ static void initAndRun(int argc, char * * argv)
else if (arg == "--keep-going" || arg == "-k") else if (arg == "--keep-going" || arg == "-k")
settings.keepGoing = true; settings.keepGoing = true;
else if (arg == "--fallback") else if (arg == "--fallback")
settings.tryFallback = true; settings.set("build-fallback", "true");
else if (arg == "--max-jobs" || arg == "-j") else if (arg == "--max-jobs" || arg == "-j")
settings.set("build-max-jobs", getArg(arg, i, args.end())); settings.set("build-max-jobs", getArg(arg, i, args.end()));
else if (arg == "--cores") else if (arg == "--cores")

3
src/libstore/globals.cc
View file

@ -118,9 +118,10 @@ void Settings::set(const string & name, const string & value)
void Settings::update() void Settings::update()
{ {
get(thisSystem, "system"); get(tryFallback, "build-fallback");
get(maxBuildJobs, "build-max-jobs"); get(maxBuildJobs, "build-max-jobs");
get(buildCores, "build-cores"); get(buildCores, "build-cores");
get(thisSystem, "system");
get(maxSilentTime, "build-max-silent-time"); get(maxSilentTime, "build-max-silent-time");
get(buildTimeout, "build-timeout"); get(buildTimeout, "build-timeout");
get(reservedSize, "gc-reserved-space"); get(reservedSize, "gc-reserved-space");