guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/09: guix package: Use absolute file names in search path recommendati


From: guix-commits
Subject: 01/09: guix package: Use absolute file names in search path recommendations.
Date: Wed, 10 Apr 2019 06:41:09 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 21b3c0ca8789c22b9b689faa01286b18f103b92e
Author: Ludovic Court├Ęs <address@hidden>
Date:   Mon Apr 8 22:16:37 2019 +0200

    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.
---
 guix/scripts/package.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm
index b0c6a7c..5642369 100644
--- a/guix/scripts/package.scm
+++ b/guix/scripts/package.scm
@@ -278,11 +278,19 @@ path definition to be returned."
                 (evaluate-search-paths search-paths profiles
                                        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
                                #:key (kind 'exact))
   "Display the search path environment variables that may need to be set for
 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
                                                       #:kind kind)))
     (unless (null? settings)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]