kreyren/guix-kreyren
1
0
Fork 0
Code Issues 1 Pull Requests 1 Releases Activity

profiles: Implicitly set GUIX_EXTENSIONS_PATH.

Browse Source 
* 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:
(unmatched-parenthesis 2022-08-21 16:43:48 +01:00 committed by Efraim Flashner
parent 0321ceef08
commit bbc1735be2
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
guix/build/profiles.scm
View File

@ -179,7 +179,8 @@ search path specifications."
(()
(values (reverse inputs)
(delete-duplicates
(cons $PATH
(cons* $PATH
$GUIX_EXTENSIONS_PATH
(map sexp->search-path-specification
(reverse search-paths)))))))))))

11
guix/search-paths.scm
View File

@ -33,6 +33,7 @@
search-path-specification-file-pattern
$PATH
$GUIX_EXTENSIONS_PATH
$SSL_CERT_DIR
$SSL_CERT_FILE
@ -73,6 +74,16 @@
(variable "PATH")
(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),
;; respected by 'openssl', possibly GnuTLS in the future
;; (https://gitlab.com/gnutls/gnutls/-/merge_requests/1541)