profiles: Implicitly set GUIX_EXTENSIONS_PATH.
* guix/build/profiles.scm (manifest-sexp->inputs+search-paths): Always return a search path for GUIX_EXTENSIONS_PATH. * guix/search-paths.scm ($GUIX_EXTENSIONS_PATH): New variable. This allows Guix to find extensions without any need for users to set GUIX_EXTENSIONS_PATH manually. Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
This commit is contained in:
parent
0321ceef08
commit
bbc1735be2
|
@ -179,9 +179,10 @@ search path specifications."
|
||||||
(()
|
(()
|
||||||
(values (reverse inputs)
|
(values (reverse inputs)
|
||||||
(delete-duplicates
|
(delete-duplicates
|
||||||
(cons $PATH
|
(cons* $PATH
|
||||||
(map sexp->search-path-specification
|
$GUIX_EXTENSIONS_PATH
|
||||||
(reverse search-paths)))))))))))
|
(map sexp->search-path-specification
|
||||||
|
(reverse search-paths)))))))))))
|
||||||
|
|
||||||
(define* (build-profile output manifest
|
(define* (build-profile output manifest
|
||||||
#:key (extra-inputs '()) (symlink symlink))
|
#:key (extra-inputs '()) (symlink symlink))
|
||||||
|
|
|
@ -33,6 +33,7 @@
|
||||||
search-path-specification-file-pattern
|
search-path-specification-file-pattern
|
||||||
|
|
||||||
$PATH
|
$PATH
|
||||||
|
$GUIX_EXTENSIONS_PATH
|
||||||
$SSL_CERT_DIR
|
$SSL_CERT_DIR
|
||||||
$SSL_CERT_FILE
|
$SSL_CERT_FILE
|
||||||
|
|
||||||
|
@ -73,6 +74,16 @@
|
||||||
(variable "PATH")
|
(variable "PATH")
|
||||||
(files '("bin" "sbin"))))
|
(files '("bin" "sbin"))))
|
||||||
|
|
||||||
|
(define-public $GUIX_EXTENSIONS_PATH
|
||||||
|
;; 'GUIX_EXTENSIONS_PATH' is used by Guix to locate extension commands.
|
||||||
|
;; Like 'PATH', it's not attached to any package, so that users don't have
|
||||||
|
;; to install the 'guix' package (which is not supposed to be installed,
|
||||||
|
;; as it will mess up the 'guix pull' installation) or set the variable
|
||||||
|
;; manually.
|
||||||
|
(search-path-specification
|
||||||
|
(variable "GUIX_EXTENSIONS_PATH")
|
||||||
|
(files '("share/guix/extensions"))))
|
||||||
|
|
||||||
;; Two variables for certificates (see (guix)X.509 Certificates),
|
;; Two variables for certificates (see (guix)X.509 Certificates),
|
||||||
;; respected by 'openssl', possibly GnuTLS in the future
|
;; respected by 'openssl', possibly GnuTLS in the future
|
||||||
;; (https://gitlab.com/gnutls/gnutls/-/merge_requests/1541)
|
;; (https://gitlab.com/gnutls/gnutls/-/merge_requests/1541)
|
||||||
|
|
Loading…
Reference in New Issue