mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-31 14:56:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

guix: environment: Consider all package outputs.

Browse source 
* guix/scripts/environment.scm (for-each-search-path): Iterate over all
  derivation output paths.
  (packages->transitive-inputs): Process inputs that specify an output, too.
This commit is contained in:
David Thompson 2015-01-29 17:53:17 -05:00
parent 5ce93d9ade
commit 4b7ad2e338
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
guix/scripts/environment.scm
View file

@ -40,7 +40,12 @@ (define (for-each-search-path proc inputs derivations pure?)
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 @@ (define (packages->transitive-inputs 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))))