diff options
author | Ludovic Courtès <ludo@gnu.org> | 2017-01-23 22:33:10 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2017-01-23 22:33:10 +0100 |
commit | 58ea4d407c2e4adbe51b2d7b71dc8bef095677c7 (patch) | |
tree | 0fd70c0cb82d7980a7ff82500dec7bfd0d535d3f /nix/nix-daemon/guix-daemon.cc | |
parent | fcd75bdbfa99d14363b905afbf914eec20e69df8 (diff) | |
parent | 84b60a7cdfca1421a478894e279104a0c18a7c6d (diff) | |
download | guix-58ea4d407c2e4adbe51b2d7b71dc8bef095677c7.tar.gz |
Merge branch 'master' into core-updates
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; |