gnu: commencement: Avoid extra Perl build in the DAG.
* gnu/packages/commencement.scm (grep-final): Move reference to PERL-BOOT0 outside of 'package-with-explicit-inputs'. Previously we would actually depend on a variant of 'perl-boot0' built with %BOOT5-INPUTS, which defeated the intent to not add an extra Perl build in the DAG.
This commit is contained in:
		
							parent
							
								
									301a424906
								
							
						
					
					
						commit
						78ca500a75
					
				
					 1 changed files with 7 additions and 8 deletions
				
			
		| 
						 | 
					@ -913,14 +913,13 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
 | 
				
			||||||
(define grep-final
 | 
					(define grep-final
 | 
				
			||||||
  ;; The final grep.  Gzip holds a reference to it (via zgrep), so it must be
 | 
					  ;; The final grep.  Gzip holds a reference to it (via zgrep), so it must be
 | 
				
			||||||
  ;; built before gzip.
 | 
					  ;; built before gzip.
 | 
				
			||||||
  (package-with-bootstrap-guile
 | 
					  (let ((grep (package-with-bootstrap-guile
 | 
				
			||||||
   (package-with-explicit-inputs (package
 | 
					               (package-with-explicit-inputs grep %boot5-inputs
 | 
				
			||||||
                                   (inherit grep)
 | 
					                                             (current-source-location)
 | 
				
			||||||
                                   (inputs '())   ;no PCRE support
 | 
					                                             #:guile guile-final))))
 | 
				
			||||||
                                   (native-inputs `(("perl" ,perl-boot0))))
 | 
					    (package/inherit grep
 | 
				
			||||||
                                 %boot5-inputs
 | 
					                     (inputs (alist-delete "pcre" (package-inputs grep)))
 | 
				
			||||||
                                 (current-source-location)
 | 
					                     (native-inputs `(("perl" ,perl-boot0))))))
 | 
				
			||||||
                                 #:guile guile-final)))
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define %boot6-inputs
 | 
					(define %boot6-inputs
 | 
				
			||||||
  ;; Now use the final Coreutils.
 | 
					  ;; Now use the final Coreutils.
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue