01/04: gnu: current-guix: Delay effectful bits.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 863519f660fdebefbbb7f7c18b4875ba9b05f74c
Author: Ludovic Courtès <address@hidden>
Date:   Tue Mar 26 11:06:16 2019 +0100

    gnu: current-guix: Delay effectful bits.
    
    * gnu/packages/package-management.scm (current-guix): Delay 
'repository-root'.
---
 gnu/packages/package-management.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/package-management.scm 
b/gnu/packages/package-management.scm
index 62bed6b..07a6c24 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -410,10 +410,10 @@ generated file."
   (make-parameter #f))
 
 (define-public current-guix
-  (let* ((repository-root (canonicalize-path
-                           (string-append (current-source-directory)
-                                          "/../..")))
-         (select? (delay (or (git-predicate repository-root)
+  (let* ((repository-root (delay (canonicalize-path
+                                  (string-append (current-source-directory)
+                                                 "/../.."))))
+         (select? (delay (or (git-predicate (force repository-root))
                              source-file?))))
     (lambda ()
       "Return a package representing Guix built from the current source tree.
@@ -423,7 +423,7 @@ out) and returning a package that uses that as its 
'source'."
           (package
             (inherit guix)
             (version (string-append (package-version guix) "+"))
-            (source (local-file repository-root "guix-current"
+            (source (local-file (force repository-root) "guix-current"
                                 #:recursive? #t
                                 #:select? (force select?))))))))