guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[no subject]


From: Ludovic Courtès
Date: Sat, 7 Apr 2018 12:55:57 -0400 (EDT)

branch: master
commit b9b53e67ba0eb341e0165434fcaa0c92d344afe3
Author: Ludovic Courtès <address@hidden>
Date:   Sat Apr 7 18:13:56 2018 +0200

    evaluate: Really support 'build-derivations' RPCs.
    
    Fixes a thinko introduced in
    1872dd95253b4805a00bfe5dee8d1a0ed90af149.
    
    * bin/evaluate.in (main): Make sure 'real-build-things' is bound.
---
 bin/evaluate.in | 11 ++++++-----
 1 file 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:address@hidden@} --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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]