mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
gnu: current-guix: Delay effectful bits.
* gnu/packages/package-management.scm (current-guix): Delay 'repository-root'.
This commit is contained in:
parent
28d32817d8
commit
863519f660
1 changed files with 5 additions and 5 deletions
|
@ -410,10 +410,10 @@ (define-public current-guix-package
|
|||
(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 @@ (define-public current-guix
|
|||
(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?))))))))
|
||||
|
||||
|
|
Loading…
Reference in a new issue