~ruther/guix-local

fa96048f0a97b4265b3c52f30a5accf89e96174b — Ludovic Courtès 10 years ago feca8e2
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.
1 files changed, 6 insertions(+), 4 deletions(-)

M guix/profiles.scm
M guix/profiles.scm => guix/profiles.scm +6 -4
@@ 702,7 702,8 @@ the monadic procedures listed in HOOKS--such as an Info 'dir' file, etc."
    (define builder
      #~(begin
          (use-modules (guix build profiles)
                       (guix search-paths))
                       (guix search-paths)
                       (srfi srfi-1))

          (setvbuf (current-output-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
            ;; record form.
            (map sexp->search-path-specification
                 '#$(map search-path-specification->sexp
                         (append-map manifest-entry-search-paths
                                     (manifest-entries manifest)))))
                 (delete-duplicates
                  '#$(map search-path-specification->sexp
                          (append-map manifest-entry-search-paths
                                      (manifest-entries manifest))))))

          (build-profile #$output '#$inputs
                         #:manifest '#$(manifest->gexp manifest)