me
/
guix
Archived
1
0
Fork 0
Code

package: Use ~/.guix-profile as the default for --search-paths. 

* guix/scripts/package.scm (search-path-environment-variables): Prefer
  %USER-ENVIRONMENT-DIRECTORY when it points to PROFILE.
  (display-search-paths): Use 3 spaces for indentation.
master
Ludovic Courtès 2013-05-09 22:58:23 +02:00
parent 9c7dd33a48
commit a81bc5312b
1 changed files with 38 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
guix/scripts/package.scm
View File

@ -336,6 +336,14 @@ but ~a is available upstream~%")
PACKAGES in PROFILE. Use GETENV to determine the current settings and report PACKAGES in PROFILE. Use GETENV to determine the current settings and report
only settings not already effective." only settings not already effective."
;; Prefer ~/.guix-profile to the real profile directory name.
(let ((profile (if (and %user-environment-directory
(false-if-exception
(string=? (readlink %user-environment-directory)
profile)))
%user-environment-directory
profile)))
;; The search path info is not stored in the manifest. Thus, we infer the ;; The search path info is not stored in the manifest. Thus, we infer the
;; search paths from same-named packages found in the distro. ;; search paths from same-named packages found in the distro.
@ -367,7 +375,7 @@ only settings not already effective."
(search-paths (delete-duplicates (search-paths (delete-duplicates
(append-map package-native-search-paths (append-map package-native-search-paths
packages)))) packages))))
(filter-map search-path-definition search-paths))) (filter-map search-path-definition search-paths))))
(define (display-search-paths packages profile) (define (display-search-paths packages profile)
"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