aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-08-20 19:12:36 +0200
committerLudovic Courtès <ludo@gnu.org>2015-08-20 19:12:36 +0200
commitfa96048f0a97b4265b3c52f30a5accf89e96174b (patch)
treec2208dc8a76c209b22f3a38fa26ab60bcc595474
parentfeca8e2bc703b97ea2862935f762d423f983be7e (diff)
downloadguix-fa96048f0a97b4265b3c52f30a5accf89e96174b.tar
guix-fa96048f0a97b4265b3c52f30a5accf89e96174b.tar.gz
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.
-rw-r--r--guix/profiles.scm10
1 files changed, 6 insertions, 4 deletions
diff --git a/guix/profiles.scm b/guix/profiles.scm
index 5c19c95d42..d19b49f6d2 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -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)