diff options
| author | Leo Famulari <leo@famulari.name> | 2018-10-07 20:49:14 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2018-10-07 20:49:14 -0400 |
| commit | e8bd1946ec1df9f52f87292172af5b4e4a4e0023 (patch) | |
| tree | e3209b814be53b0c21f29438a491c2aedcc2d1c5 /guix | |
| parent | cf6db76d2af2f287f12928df160447ab4165b3e5 (diff) | |
| parent | a18accba468beecf0200383f56d02894caf6f41a (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/build-system/glib-or-gtk.scm | 2 | ||||
| -rw-r--r-- | guix/progress.scm | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/guix/build-system/glib-or-gtk.scm b/guix/build-system/glib-or-gtk.scm index 621e68e0ab..fcd92f2334 100644 --- a/guix/build-system/glib-or-gtk.scm +++ b/guix/build-system/glib-or-gtk.scm @@ -112,7 +112,7 @@ (configure-flags ''()) ;; Disable icon theme cache generation. (make-flags ''("gtk_update_icon_cache=true")) - (out-of-source? #t) + (out-of-source? #f) (tests? #t) (test-target "check") (parallel-build? #t) diff --git a/guix/progress.scm b/guix/progress.scm index f846944952..9da667a027 100644 --- a/guix/progress.scm +++ b/guix/progress.scm @@ -289,6 +289,8 @@ tasks is performed. Write PREFIX at the beginning of the line." #:optional (log-port (current-output-port))) "Like 'progress-reporter/file', but instead of returning human-readable progress reports, write \"build trace\" lines to be processed elsewhere." + (define total 0) ;bytes transferred + (define (report-progress transferred) (define message (format #f "@ download-progress ~a ~a ~a ~a~%" @@ -299,13 +301,16 @@ progress reports, write \"build trace\" lines to be processed elsewhere." (progress-reporter (start (lambda () + (set! total 0) (display (format #f "@ download-started ~a ~a ~a~%" file url (or size "-")) log-port))) - (report (rate-limited report-progress %progress-interval)) + (report (let ((report (rate-limited report-progress %progress-interval))) + (lambda (transferred) + (set! total transferred) + (report transferred)))) (stop (lambda () - (let ((size (or (and=> (stat file #f) stat:size) - size))) + (let ((size (or size total))) (report-progress size) (display (format #f "@ download-succeeded ~a ~a ~a~%" file url size) |