mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 22:08:16 -05:00
gnu: u-boot-puma-rk3399: Use gexps and fix build.
* gnu/packages/bootloaders.scm (u-boot-puma-rk3399) [arguments]: Use gexps. [native-inputs]: Turn into... [inputs]: ... this, and use modify-inputs. Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
This commit is contained in:
parent
4276283b30
commit
12f1b5fe4e
1 changed files with 10 additions and 11 deletions
|
@ -1091,17 +1091,16 @@ (define-public u-boot-puma-rk3399
|
||||||
(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 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-native-inputs base)
|
||||||
`(("firmware" ,arm-trusted-firmware-rk3399)
|
(append arm-trusted-firmware-rk3399))))))
|
||||||
,@(package-native-inputs base))))))
|
|
||||||
|
|
||||||
(define-public u-boot-qemu-riscv64
|
(define-public u-boot-qemu-riscv64
|
||||||
(make-u-boot-package "qemu-riscv64" "riscv64-linux-gnu"))
|
(make-u-boot-package "qemu-riscv64" "riscv64-linux-gnu"))
|
||||||
|
|
Loading…
Reference in a new issue