diff options
author | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-06-23 18:45:21 +0200 |
---|---|---|
committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-06-23 18:45:21 +0200 |
commit | 9dea3f101f252331c049c03f501398a5ec837ba9 (patch) | |
tree | 61d683a9fae3e147332d07fef207c1ddf51fc301 /guix/build/profiles.scm | |
parent | 7f0af119a1e3ea9d0ae53811b619437b3e942702 (diff) | |
parent | 620669fd17306c2edb21c64a99fa47160fefb319 (diff) | |
download | guix-patches-9dea3f101f252331c049c03f501398a5ec837ba9.tar guix-patches-9dea3f101f252331c049c03f501398a5ec837ba9.tar.gz |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/cups.scm
gnu/packages/python-web.scm
gnu/packages/web.scm
guix/build/maven/pom.scm
Diffstat (limited to 'guix/build/profiles.scm')
-rw-r--r-- | guix/build/profiles.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/guix/build/profiles.scm b/guix/build/profiles.scm index 9249977bed..f9875ca92e 100644 --- a/guix/build/profiles.scm +++ b/guix/build/profiles.scm @@ -159,15 +159,15 @@ search path specifications." (((name version output item ('propagated-inputs deps) ('search-paths paths) _ ...) . rest) - (loop (append deps rest) + (loop (append rest deps) ;breadth-first traversal (cons item inputs) (append paths search-paths))) (() - (values inputs + (values (reverse inputs) (delete-duplicates (cons $PATH (map sexp->search-path-specification - search-paths)))))))))) + (reverse search-paths))))))))))) (define* (build-profile output manifest #:key (extra-inputs '()) (symlink symlink)) |