diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-02-13 22:35:05 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-02-13 22:35:05 +0100 |
| commit | 424b1ae76901c538457bd3c30d9d9cf67e79855f (patch) | |
| tree | acc35c1160625618cd6083e728c6a4ff7e9cccc9 /nix/nix-daemon/guix-daemon.cc | |
| parent | a50e03014177d2f00b5b85d3e1c295406f842016 (diff) | |
| parent | eae2dbd47ac1f4a201b8584e2f88c30cd28e093a (diff) | |
| download | patches-424b1ae76901c538457bd3c30d9d9cf67e79855f.tar patches-424b1ae76901c538457bd3c30d9d9cf67e79855f.tar.gz | |
Merge branch 'master' into python-tests
Diffstat (limited to 'nix/nix-daemon/guix-daemon.cc')
| -rw-r--r-- | nix/nix-daemon/guix-daemon.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nix/nix-daemon/guix-daemon.cc b/nix/nix-daemon/guix-daemon.cc index d5d33a587a..aa47a290d2 100644 --- a/nix/nix-daemon/guix-daemon.cc +++ b/nix/nix-daemon/guix-daemon.cc @@ -1,5 +1,5 @@ /* GNU Guix --- Functional package management for GNU - Copyright (C) 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org> + Copyright (C) 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> This file is part of GNU Guix. @@ -301,8 +301,9 @@ main (int argc, char *argv[]) /* Turn automatic deduplication on by default. */ settings.autoOptimiseStore = true; - /* Default to using as many cores as possible. */ + /* Default to using as many cores as possible and one job at a time. */ settings.buildCores = 0; + settings.maxBuildJobs = 1; argvSaved = argv; |