diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-04-08 13:00:50 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-04-08 13:00:50 +0200 |
| commit | 27783023993f9272ce422868d14529159c4a5218 (patch) | |
| tree | 9013b08aa39e497b1fd8e01a05254278d83f0ff7 /build-aux | |
| parent | be1e842ad78ac6c52fc7790f4a3ffd716673c111 (diff) | |
| parent | ba6f2bda18ed19fa486a9c3e2c3baea6c66c6867 (diff) | |
Merge branch 'master' into core-updates
Conflicts:
etc/news.scm
gnu/local.mk
gnu/packages/check.scm
gnu/packages/cross-base.scm
gnu/packages/gimp.scm
gnu/packages/java.scm
gnu/packages/mail.scm
gnu/packages/sdl.scm
gnu/packages/texinfo.scm
gnu/packages/tls.scm
gnu/packages/version-control.scm
Diffstat (limited to 'build-aux')
| -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 b6a69a46e9..e2495919d5 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 |