nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

profiles: Remove duplicate entries in 'etc/profile'. 

Reported by Andy Wingo
at <http://lists.gnu.org/archive/html/guix-devel/2015-08/msg00109.html>.

* guix/profiles.scm (profile-derivation)[builder]: Delete duplicates in
  SEARCH-PATHS.
This commit is contained in:
Ludovic Courtès 2015-08-20 19:12:36 +02:00
parent feca8e2bc7
commit fa96048f0a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
guix/profiles.scm
View File

@ -702,7 +702,8 @@ the monadic procedures listed in HOOKS--such as an Info 'dir' file, etc."
(define builder (define builder
#~(begin #~(begin
(use-modules (guix build profiles) (use-modules (guix build profiles)
(guix search-paths)) (guix search-paths)
(srfi srfi-1))
(setvbuf (current-output-port) _IOLBF) (setvbuf (current-output-port) _IOLBF)
(setvbuf (current-error-port) _IOLBF) (setvbuf (current-error-port) _IOLBF)
@ -711,9 +712,10 @@ the monadic procedures listed in HOOKS--such as an Info 'dir' file, etc."
;; Search paths of MANIFEST's packages, converted back to their ;; Search paths of MANIFEST's packages, converted back to their
;; record form. ;; record form.
(map sexp->search-path-specification (map sexp->search-path-specification
'#$(map search-path-specification->sexp (delete-duplicates
(append-map manifest-entry-search-paths '#$(map search-path-specification->sexp
(manifest-entries manifest))))) (append-map manifest-entry-search-paths
(manifest-entries manifest))))))
(build-profile #$output '#$inputs (build-profile #$output '#$inputs
#:manifest '#$(manifest->gexp manifest) #:manifest '#$(manifest->gexp manifest)