03/05: build-self: Avoid call to 'show-what-to-build*' on modern Guix.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 11dee1bb8fbe6efd85280ca58f3bd2f90baef31a
Author: Ludovic Courtès <address@hidden>
AuthorDate: Mon Apr 6 11:06:53 2020 +0200

    build-self: Avoid call to 'show-what-to-build*' on modern Guix.
    
    This avoids repeated "will be downloaded" messages for
    'compute-guix-derivation' and its dependencies.
    
    * build-aux/build-self.scm (build): Don't call 'show-what-to-build*'
    when 'with-build-handler' is defined.
---
 build-aux/build-self.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm
index 2782a4d..f86c79f 100644
--- a/build-aux/build-self.scm
+++ b/build-aux/build-self.scm
@@ -408,7 +408,11 @@ files."
                       (major  ((store-lift nix-server-major-version)))
                       (minor  ((store-lift nix-server-minor-version))))
     (mbegin %store-monad
-      (show-what-to-build* (list build))
+      ;; Before 'with-build-handler' was implemented and used, we had to
+      ;; explicitly call 'show-what-to-build*'.
+      (munless (module-defined? (resolve-module '(guix store))
+                                'with-build-handler)
+        (show-what-to-build* (list build)))
       (built-derivations (list build))
 
       ;; Use the port beneath the current store as the stdin of BUILD.  This