diff options
| author | Leo Famulari <leo@famulari.name> | 2018-01-11 14:22:50 -0800 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2018-01-11 14:22:50 -0800 |
| commit | 4adb40bffc0dda8871878283887a0e0cd88d9578 (patch) | |
| tree | 74d5fb686116002da72de4a1075d0ed8f307cec1 /nix/libstore/globals.cc | |
| parent | 4610ab7c9a5327df0d475262817bc081a5891aa8 (diff) | |
| parent | 138c08899ba73049de8afd2b74a8cf6845a1d9e1 (diff) | |
| download | guix-4adb40bffc0dda8871878283887a0e0cd88d9578.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'nix/libstore/globals.cc')
| -rw-r--r-- | nix/libstore/globals.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/nix/libstore/globals.cc b/nix/libstore/globals.cc index 65dad24d91..4ab6c3a0f9 100644 --- a/nix/libstore/globals.cc +++ b/nix/libstore/globals.cc @@ -45,7 +45,11 @@ Settings::Settings() useSshSubstituter = false; impersonateLinux26 = false; keepLog = true; - compressLog = true; +#if HAVE_BZLIB_H + logCompression = COMPRESSION_BZIP2; +#else + logCompression = COMPRESSION_GZIP; +#endif maxLogSize = 0; cacheFailure = false; pollInterval = 5; @@ -162,7 +166,7 @@ void Settings::update() _get(useChroot, "build-use-chroot"); _get(impersonateLinux26, "build-impersonate-linux-26"); _get(keepLog, "build-keep-log"); - _get(compressLog, "build-compress-log"); + // _get(logCompression, "build-log-compression"); _get(maxLogSize, "build-max-log-size"); _get(cacheFailure, "build-cache-failure"); _get(pollInterval, "build-poll-interval"); |