diff options
Diffstat (limited to 'gnu/packages/bootloaders.scm')
-rw-r--r-- | gnu/packages/bootloaders.scm | 42 |
1 files changed, 17 insertions, 25 deletions
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 742992a119..b4bf72224a 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> @@ -139,9 +139,9 @@ ;; Give the absolute file name of 'ckbcomp'. (substitute* "util/grub-kbdcomp.in" (("^ckbcomp ") - (string-append (assoc-ref inputs "console-setup") - "/bin/ckbcomp "))) - #t)) + (string-append + (search-input-file inputs "/bin/ckbcomp") + " "))))) (add-after 'unpack 'set-freetype-variables ;; These variables need to be set to the native versions ;; of the dependencies because they are used to build @@ -315,9 +315,8 @@ menu to select one of the installed operating systems.") (lambda* (#:key inputs #:allow-other-keys) (substitute* "grub-core/osdep/unix/platform.c" (("efibootmgr") - (string-append (assoc-ref inputs "efibootmgr") - "/sbin/efibootmgr"))) - #t)) + (search-input-file inputs + "/sbin/efibootmgr"))))) (add-after 'patch-stuff 'use-absolute-mtools-path (lambda* (#:key inputs #:allow-other-keys) (let ((mtools (assoc-ref inputs "mtools"))) @@ -352,8 +351,8 @@ menu to select one of the installed operating systems.") `(modify-phases ,phases (add-after 'install 'install-non-efi (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((input-dir (string-append (assoc-ref inputs "grub") - "/lib/grub")) + (let ((input-dir (search-input-directory inputs + "/lib/grub")) (output-dir (string-append (assoc-ref outputs "out") "/lib/grub"))) (for-each @@ -853,9 +852,8 @@ to Novena upstream, does not load u-boot.img from the first partition.") `(modify-phases ,phases (add-after 'unpack 'set-environment (lambda* (#:key inputs #:allow-other-keys) - (setenv "BL31" (string-append (assoc-ref inputs "firmware") - "/bl31.elf")) - #t)) + (setenv "BL31" + (search-input-file inputs "/bl31.elf")))) ;; Phases do not succeed on the bl31 ELF. (delete 'strip) (delete 'validate-runpath))))) @@ -895,10 +893,8 @@ to Novena upstream, does not load u-boot.img from the first partition.") `(modify-phases ,phases (add-after 'unpack 'set-environment (lambda* (#:key inputs #:allow-other-keys) - (let ((bl31 (string-append (assoc-ref inputs "firmware") - "/bl31.elf"))) - (setenv "BL31" bl31)) - #t)))))) + (let ((bl31 (search-input-file inputs "/bl31.elf"))) + (setenv "BL31" bl31)))))))) (native-inputs `(("firmware" ,arm-trusted-firmware-rk3328) ,@(package-native-inputs base)))))) @@ -913,9 +909,7 @@ to Novena upstream, does not load u-boot.img from the first partition.") `(modify-phases ,phases (add-after 'unpack 'set-environment (lambda* (#:key inputs #:allow-other-keys) - (setenv "BL31" (string-append (assoc-ref inputs "firmware") - "/bl31.elf")) - #t)) + (setenv "BL31" (search-input-file inputs "/bl31.elf")))) ;; Phases do not succeed on the bl31 ELF. (delete 'strip) (delete 'validate-runpath))))) @@ -933,9 +927,8 @@ to Novena upstream, does not load u-boot.img from the first partition.") `(modify-phases ,phases (add-after 'patch-rockpro64-config 'set-environment (lambda* (#:key inputs #:allow-other-keys) - (setenv "BL31" (string-append (assoc-ref inputs "firmware") - "/bl31.elf")) - #t)) + (setenv "BL31" + (search-input-file inputs "/bl31.elf")))) ;; Phases do not succeed on the bl31 ELF. (delete 'strip) (delete 'validate-runpath))))) @@ -955,9 +948,8 @@ to Novena upstream, does not load u-boot.img from the first partition.") `(modify-phases ,phases (add-after 'unpack 'set-environment (lambda* (#:key inputs #:allow-other-keys) - (setenv "BL31" (string-append (assoc-ref inputs "firmware") - "/bl31.elf")) - #t)) + (setenv "BL31" + (search-input-file inputs "/bl31.elf")))) ;; Phases do not succeed on the bl31 ELF. (delete 'strip) (delete 'validate-runpath))))) |