01/01: guix: environment: Consider all package outputs.

[David Thompson]

davexunit pushed a commit to branch master
in repository guix.

commit 4b7ad2e3382dcc06107619a3f183e9e22df7ba03
Author: David Thompson <address@hidden>
Date:   Thu Jan 29 17:53:17 2015 -0500

    guix: environment: Consider all package outputs.
    
    * guix/scripts/environment.scm (for-each-search-path): Iterate over all
      derivation output paths.
      (packages->transitive-inputs): Process inputs that specify an output, too.
---
 guix/scripts/environment.scm |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index ffa3a09..bb2ce53 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -40,7 +40,12 @@
 Use the output paths of DERIVATIONS to build each search path.  When PURE? is
 #t, the existing search path value is ignored.  Otherwise, the existing search
 path value is appended."
-  (let ((paths (map derivation->output-path derivations)))
+  (let ((paths (append-map (lambda (drv)
+                             (map (match-lambda
+                                   ((_ . output)
+                                    (derivation-output-path output)))
+                                  (derivation-outputs drv)))
+                           derivations)))
     (for-each (match-lambda
                (($ <search-path-specification>
                    variable directories separator)
@@ -177,7 +182,9 @@ packages."
   "Return a list of the transitive inputs for all PACKAGES."
   (define (transitive-inputs package)
     (filter-map (match-lambda
-                 ((_ (? package? package)) package)
+                 ((or (_ (? package? package))
+                      (_ (? package? package) _))
+                  package)
                  (_ #f))
                 (bag-transitive-inputs
                  (package->bag package))))