~ruther/guix-local: gnu: `expression->derivation-in-linux-vm' accepts files as inputs.

4c0f0673b2334077ac11f3d835d045c81d9854e0 — Ludovic Courtès 12 years ago ca85d7b

gnu: `expression->derivation-in-linux-vm' accepts files as inputs.

* gnu/system/vm.scm (expression->derivation-in-linux-vm): Accept items
  in INPUTS that refer to a file instead of a package.

patch browse .tar.gz

1 files changed, 10 insertions(+), 5 deletions(-)

M gnu/system/vm.scm

M gnu/system/vm.scm => gnu/system/vm.scm +10 -5

@@ 70,10 70,12 @@ pairs, as for `derivation'.  The files containing the reference graphs are
 made available under the /xchg CIFS share."
   (define input-alist
     (map (match-lambda
-          ((input package)
+          ((input (? package? package))
            `(,input . ,(package-output store package "out" system)))
-          ((input package sub-drv)
-           `(,input . ,(package-output store package sub-drv system))))
+          ((input (? package? package) sub-drv)
+           `(,input . ,(package-output store package sub-drv system)))
+          ((input (and (? string?) (? store-path?) file))
+           `(,input . ,file)))
          inputs))
 
   (define exp*


@@ 153,9 155,12 @@ made available under the /xchg CIFS share."
                                     ("coreutils" ,(->drv coreutils))
                                     ("builder" ,user-builder)
                                     ,@(map (match-lambda
-                                            ((name package sub-drv ...)
+                                            ((name (? package? package)
+                                                   sub-drv ...)
                                              `(,name ,(->drv package)
-                                                     ,@sub-drv)))
+                                                     ,@sub-drv))
+                                            ((name (? string? file))
+                                             `(,name ,file)))
                                            inputs))
                                   #:env-vars env-vars
                                   #:modules (delete-duplicates