nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: grub: Fix cross-compilation. 

* gnu/packages/bootloaders.scm (grub)[arguments]: Search for unifont in both
native-inputs and inputs.
This commit is contained in:
Mathieu Othacehe 2019-08-18 13:02:21 +02:00
parent 58a75996ec
commit 7c35342472
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnu/packages/bootloaders.scm
View File

@ -99,7 +99,7 @@
(list "PYTHON=true") (list "PYTHON=true")
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-after 'unpack 'patch-stuff (add-after 'unpack 'patch-stuff
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key native-inputs inputs #:allow-other-keys)
(substitute* "grub-core/Makefile.in" (substitute* "grub-core/Makefile.in"
(("/bin/sh") (which "sh"))) (("/bin/sh") (which "sh")))
@ -114,7 +114,9 @@
"/sbin/mdadm\""))) "/sbin/mdadm\"")))
;; Make the font visible. ;; Make the font visible.
(copy-file (assoc-ref inputs "unifont") "unifont.bdf.gz") (copy-file (assoc-ref (or native-inputs inputs)
"unifont")
"unifont.bdf.gz")
(system* "gunzip" "unifont.bdf.gz") (system* "gunzip" "unifont.bdf.gz")
;; Give the absolute file name of 'ckbcomp'. ;; Give the absolute file name of 'ckbcomp'.