me
/
guix
Archived
1
0
Fork 0
Code

guix package: Use absolute file names in search path recommendations. 

Suggested by Chris Marusich.

* guix/scripts/package.scm (absolutize): New procedure.
(display-search-paths): Use it.
master
Ludovic Courtès 2019-04-08 22:16:37 +02:00
parent 6b11da7db2
commit 21b3c0ca87
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
guix/scripts/package.scm
View File

@ -278,11 +278,19 @@ path definition to be returned."
(evaluate-search-paths search-paths profiles (evaluate-search-paths search-paths profiles
getenv)))) getenv))))
(define (absolutize file)
"Return an absolute file name equivalent to FILE, but without resolving
symlinks like 'canonicalize-path' would do."
(if (string-prefix? "/" file)
file
(string-append (getcwd) "/" file)))
(define* (display-search-paths entries profiles (define* (display-search-paths entries profiles
#:key (kind 'exact)) #:key (kind 'exact))
"Display the search path environment variables that may need to be set for "Display the search path environment variables that may need to be set for
ENTRIES, a list of manifest entries, in the context of PROFILE." ENTRIES, a list of manifest entries, in the context of PROFILE."
(let* ((profiles (map user-friendly-profile profiles)) (let* ((profiles (map (compose user-friendly-profile absolutize)
profiles))
(settings (search-path-environment-variables entries profiles (settings (search-path-environment-variables entries profiles
#:kind kind))) #:kind kind)))
(unless (null? settings) (unless (null? settings)