packages: Make sure the patch inputs are not #f.
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:
		
							parent
							
								
									ec3b1c575d
								
							
						
					
					
						commit
						a158484db4
					
				
					 1 changed files with 9 additions and 5 deletions
				
			
		|  | @ -353,7 +353,7 @@ the build code of derivation." | |||
| 
 | ||||
| (define* (patch-and-repack source patches | ||||
|                            #:key | ||||
|                            (inputs (%standard-patch-inputs)) | ||||
|                            inputs | ||||
|                            (snippet #f) | ||||
|                            (flags '("-p1")) | ||||
|                            (modules '()) | ||||
|  | @ -371,10 +371,14 @@ IMPORTED-MODULES specify modules to use/import for use by SNIPPET." | |||
|         (derivation->output-path source) | ||||
|         source)) | ||||
| 
 | ||||
|   (define (lookup-input name) | ||||
|   (define lookup-input | ||||
|     ;; The default value of the 'patch-inputs' field, and thus INPUTS is #f, | ||||
|     ;; so deal with that. | ||||
|     (let ((inputs (or inputs (%standard-patch-inputs)))) | ||||
|       (lambda (name) | ||||
|         (match (assoc-ref inputs name) | ||||
|           ((package) package) | ||||
|       (#f        #f))) | ||||
|           (#f        #f))))) | ||||
| 
 | ||||
|   (define decompression-type | ||||
|     (cond ((string-suffix? "gz" source-file-name)  "gzip") | ||||
|  |  | |||
		Reference in a new issue