me/guix
Archived
1
0
Fork 0
Code Activity

packages: Make sure the patch inputs are not #f.

Browse source 
Fixes build issues whereby #:inputs would be #f.  See
<http://hydra.gnu.org/build/320333/nixlog/4/tail-reload>.

* guix/packages.scm (patch-and-repack): #:input defaults to #f.
  [lookup-input]: When INPUTS is #f, use (%standard-patch-inputs).
This commit is contained in:
Ludovic Courtès 2015-03-21 22:07:11 +01:00
parent ec3b1c575d
commit a158484db4
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
guix/packages.scm
View file

@ -353,7 +353,7 @@ the build code of derivation."
(define* (patch-and-repack source patches (define* (patch-and-repack source patches
#:key #:key
(inputs (%standard-patch-inputs)) inputs
(snippet #f) (snippet #f)
(flags '("-p1")) (flags '("-p1"))
(modules '()) (modules '())
@ -371,10 +371,14 @@ IMPORTED-MODULES specify modules to use/import for use by SNIPPET."
(derivation->output-path source) (derivation->output-path source)
source)) source))
(define (lookup-input name) (define lookup-input
(match (assoc-ref inputs name) ;; The default value of the 'patch-inputs' field, and thus INPUTS is #f,
((package) package) ;; so deal with that.
(#f #f))) (let ((inputs (or inputs (%standard-patch-inputs))))
(lambda (name)
(match (assoc-ref inputs name)
((package) package)
(#f #f)))))
(define decompression-type (define decompression-type
(cond ((string-suffix? "gz" source-file-name) "gzip") (cond ((string-suffix? "gz" source-file-name) "gzip")