ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 13:49:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: vm: Support derivation objects as inputs.

Browse source 
* gnu/system/vm.scm (expression->derivation-in-linux-vm)[input-alist]:
  Add case for derivation? objects.
  Same for #:inputs values.
  (qemu-image)[input->name+derivation]: Likewise.
This commit is contained in:
Ludovic Courtès 2013-09-25 17:27:02 +02:00
parent 8f37bf6200
commit 37c58656eb
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gnu/system/vm.scm
View file

@ -92,6 +92,10 @@ (define input-alist
`(,input . ,(package-output store package "out" system))) `(,input . ,(package-output store package "out" system)))
((input (? package? package) sub-drv) ((input (? package? package) sub-drv)
`(,input . ,(package-output store package sub-drv system))) `(,input . ,(package-output store package sub-drv system)))
((input (? derivation? drv))
`(,input . ,(derivation->output-path drv)))
((input (? derivation? drv) sub-drv)
`(,input . ,(derivation->output-path drv sub-drv)))
((input (and (? string?) (? store-path?) file)) ((input (and (? string?) (? store-path?) file))
`(,input . ,file))) `(,input . ,file)))
inputs)) inputs))
@ -178,7 +182,8 @@ (define builder
`(,name ,(->drv package) `(,name ,(->drv package)
,@sub-drv)) ,@sub-drv))
((name (? string? file)) ((name (? string? file))
`(,name ,file))) `(,name ,file))
(tuple tuple))
inputs)) inputs))
#:env-vars env-vars #:env-vars env-vars
#:modules (delete-duplicates #:modules (delete-duplicates
@ -216,6 +221,10 @@ (define input->name+derivation
`(,name . ,(derivation->output-path `(,name . ,(derivation->output-path
(package-derivation store package system) (package-derivation store package system)
sub-drv))) sub-drv)))
((name (? derivation? drv))
`(,name . ,(derivation->output-path drv)))
((name (? derivation? drv) sub-drv)
`(,name . ,(derivation->output-path drv sub-drv)))
((input (and (? string?) (? store-path?) file)) ((input (and (? string?) (? store-path?) file))
`(,input . ,file)))) `(,input . ,file))))