aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-04-07 18:13:56 +0200
committerLudovic Courtès <ludo@gnu.org>2018-04-07 18:14:38 +0200
commitb9b53e67ba0eb341e0165434fcaa0c92d344afe3 (patch)
tree5453fb9517f45e4fda22687b38e53bb88fb1168d
parent38d367d71c1513a905d8e6006134bafe68b7e580 (diff)
downloadcuirass-b9b53e67ba0eb341e0165434fcaa0c92d344afe3.tar
cuirass-b9b53e67ba0eb341e0165434fcaa0c92d344afe3.tar.gz
evaluate: Really support 'build-derivations' RPCs.
Fixes a thinko introduced in 1872dd95253b4805a00bfe5dee8d1a0ed90af149. * bin/evaluate.in (main): Make sure 'real-build-things' is bound.
-rw-r--r--bin/evaluate.in11
1 files changed, 6 insertions, 5 deletions
diff --git a/bin/evaluate.in b/bin/evaluate.in
index 6a2678e..0d2ef9c 100644
--- a/bin/evaluate.in
+++ b/bin/evaluate.in
@@ -55,11 +55,12 @@ exec ${GUILE:-@GUILE@} --no-auto-compile -e main -s "$0" "$@"
;; during evaluation, so use a sledgehammer to catch such problems.
;; An exception, though, is the evaluation of Guix itself, which
;; requires building a "trampoline" program.
- (set! build-things
- (lambda (store . args)
- (simple-format stderr "warning: building things during evaluation~%")
- (simple-format stderr "'build-things' arguments: ~S~%" args)
- (apply real-build-things store args)))
+ (let ((real-build-things build-things))
+ (set! build-things
+ (lambda (store . args)
+ (simple-format stderr "warning: building things during evaluation~%")
+ (simple-format stderr "'build-things' arguments: ~S~%" args)
+ (apply real-build-things store args))))
(parameterize ((%use-substitutes? (assoc-ref spec #:use-substitutes?)))
(unless (string-null? guix-package-path)