gnu: u-boot-pinebook-pro-rk3399: Remove input labels and use gexps.
* gnu/packages/bootloaders.scm (u-boot-pinebook-pro-rk3399) [arguments]: Remove input labels. [native-inputs]: Use modify-inputs and turn into... [inputs]: ... this. Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
This commit is contained in:
		
							parent
							
								
									980abad24d
								
							
						
					
					
						commit
						c9c195936d
					
				
					 1 changed files with 10 additions and 11 deletions
				
			
		| 
						 | 
					@ -1221,17 +1221,16 @@ BOOT_TARGET_NVME(func) \\
 | 
				
			||||||
      (arguments
 | 
					      (arguments
 | 
				
			||||||
       (substitute-keyword-arguments (package-arguments base)
 | 
					       (substitute-keyword-arguments (package-arguments base)
 | 
				
			||||||
         ((#:phases phases)
 | 
					         ((#:phases phases)
 | 
				
			||||||
          `(modify-phases ,phases
 | 
					          #~(modify-phases #$phases
 | 
				
			||||||
             (add-after 'unpack 'set-environment
 | 
					              (add-after 'unpack 'set-environment
 | 
				
			||||||
               (lambda* (#:key inputs #:allow-other-keys)
 | 
					                (lambda* (#:key native-inputs inputs #:allow-other-keys)
 | 
				
			||||||
                 (setenv "BL31"
 | 
					                  (setenv "BL31" (search-input-file inputs "bl31.elf"))))
 | 
				
			||||||
                         (search-input-file inputs "/bl31.elf"))))
 | 
					              ;; Phases do not succeed on the bl31 ELF.
 | 
				
			||||||
             ;; Phases do not succeed on the bl31 ELF.
 | 
					              (delete 'strip)
 | 
				
			||||||
             (delete 'strip)
 | 
					              (delete 'validate-runpath)))))
 | 
				
			||||||
             (delete 'validate-runpath)))))
 | 
					      (inputs
 | 
				
			||||||
      (native-inputs
 | 
					       (modify-inputs (package-inputs base)
 | 
				
			||||||
       `(("firmware" ,arm-trusted-firmware-rk3399)
 | 
					         (append arm-trusted-firmware-rk3399))))))
 | 
				
			||||||
         ,@(package-native-inputs base))))))
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define*-public (make-u-boot-bin-package u-boot-package
 | 
					(define*-public (make-u-boot-bin-package u-boot-package
 | 
				
			||||||
                                         #:key
 | 
					                                         #:key
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue