diff options
| author | Jakub Kądziołka <kuba@kadziolka.net> | 2020-04-29 11:08:42 +0200 |
|---|---|---|
| committer | Jakub Kądziołka <kuba@kadziolka.net> | 2020-04-29 11:08:42 +0200 |
| commit | 4035c3e3525599c3aa958d498c5bc789a4adffc3 (patch) | |
| tree | e55a02215fcdb635d0504fc129526bfbf66abd14 /build-aux/build-self.scm | |
| parent | 492b82bd4d592276e65c4b9bfbe1b679a00ff09f (diff) | |
| parent | 4f0f46e4af0e342d84c5ad448258702029601e4b (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'build-aux/build-self.scm')
| -rw-r--r-- | build-aux/build-self.scm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm index 2782a4da72..f86c79f0d0 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 |