TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gexp: Add #:guile parameter to 'load-path-expression'.

Browse source 
* guix/gexp.scm (load-path-expression): Add #:guile parameter and honor it.
This commit is contained in:
Ludovic Courtès 2021-03-24 22:40:31 +01:00
parent 4d711863ac
commit b18e83b10d
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
guix/gexp.scm
View file

@ -1754,21 +1754,26 @@ (define (default-guile)
'guile-3.0)) 'guile-3.0))
(define* (load-path-expression modules #:optional (path %load-path) (define* (load-path-expression modules #:optional (path %load-path)
#:key (extensions '()) system target) #:key (extensions '()) system target
(guile (default-guile)))
"Return as a monadic value a gexp that sets '%load-path' and "Return as a monadic value a gexp that sets '%load-path' and
'%load-compiled-path' to point to MODULES, a list of module names. MODULES '%load-compiled-path' to point to MODULES, a list of module names. MODULES
are searched for in PATH. Return #f when MODULES and EXTENSIONS are empty." are searched for in PATH. Return #f when MODULES and EXTENSIONS are empty.
Assume MODULES are compiled with GUILE."
(if (and (null? modules) (null? extensions)) (if (and (null? modules) (null? extensions))
(with-monad %store-monad (with-monad %store-monad
(return #f)) (return #f))
(mlet %store-monad ((modules (imported-modules modules (mlet* %store-monad ((guile (lower-object guile system #:target #f))
#:module-path path (compiled (compiled-modules modules
#:system system)) #:guile guile
(compiled (compiled-modules modules #:extensions extensions
#:extensions extensions #:module-path path
#:module-path path #:system system
#:system system #:target target))
#:target target))) (modules (imported-modules modules
#:guile guile
#:module-path path
#:system system)))
(return (return
(gexp (eval-when (expand load eval) (gexp (eval-when (expand load eval)
;; Augment the load paths and delete duplicates. Do that ;; Augment the load paths and delete duplicates. Do that