[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#36477] [PATCH v2 53/61] gnu: grub: Fix cross-compilation.
From: |
Mathieu Othacehe |
Subject: |
[bug#36477] [PATCH v2 53/61] gnu: grub: Fix cross-compilation. |
Date: |
Wed, 21 Aug 2019 10:54:47 +0200 |
* gnu/packages/bootloaders.scm (grub)[arguments]: Search for unifont in both
native-inputs and inputs.
---
gnu/packages/bootloaders.scm | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 41a2de9706..b235e1bc78 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -99,7 +99,7 @@
(list "PYTHON=true")
#:phases (modify-phases %standard-phases
(add-after 'unpack 'patch-stuff
- (lambda* (#:key inputs #:allow-other-keys)
+ (lambda* (#:key native-inputs inputs #:allow-other-keys)
(substitute* "grub-core/Makefile.in"
(("/bin/sh") (which "sh")))
@@ -114,7 +114,9 @@
"/sbin/mdadm\"")))
;; 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")
;; Give the absolute file name of 'ckbcomp'.
--
2.17.1
- [bug#36477] [PATCH v2 49/61] gnu: guile-wm: Fix cross-compilation., (continued)
- [bug#36477] [PATCH v2 49/61] gnu: guile-wm: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 43/61] gnu: guile-gcrypt: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 44/61] gnu: libtool: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 50/61] gnu: cmake: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 52/61] gnu: mdadm: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 54/61] linux-initrd: Use native gzip., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 46/61] gnu: libnl: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 45/61] gnu: texinfo-4: Fix cross compilation, Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 51/61] gnu: console-setup: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 47/61] gnu: crda: Fix cross-compilation, Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 53/61] gnu: grub: Fix cross-compilation.,
Mathieu Othacehe <=
- [bug#36477] [PATCH v2 55/61] gnu: linux-libre: Enable built-in ext4 support., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 58/61] utils: Use target-arm64? and target-arm? helpers., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 56/61] gexp: Use cross extensions when cross-compiling., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 60/61] system: vm: Support cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 61/61] scripts: system: Add --target option., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 59/61] system: vm: Add arm64 support., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 57/61] gexp: Pass target to compiled-modules in lower-gexp., Mathieu Othacehe, 2019/08/21