[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#36477] [PATCH v3 38/48] gnu: grub: Fix cross-compilation.
From: |
Mathieu Othacehe |
Subject: |
[bug#36477] [PATCH v3 38/48] gnu: grub: Fix cross-compilation. |
Date: |
Mon, 2 Sep 2019 17:33:23 +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.20.1
- [bug#36477] [PATCH v3 28/48] gnu: libtool: Fix cross-compilation., (continued)
- [bug#36477] [PATCH v3 28/48] gnu: libtool: Fix cross-compilation., Mathieu Othacehe, 2019/09/02
- [bug#36477] [PATCH v3 32/48] gnu: crda: Fix cross-compilation, Mathieu Othacehe, 2019/09/02
- [bug#36477] [PATCH v3 33/48] gnu: guile-xcb: Fix cross-compilation., Mathieu Othacehe, 2019/09/02
- [bug#36477] [PATCH v3 31/48] gnu: libnl: Fix cross-compilation., Mathieu Othacehe, 2019/09/02
- [bug#36477] [PATCH v3 35/48] gnu: cmake: Fix cross-compilation., Mathieu Othacehe, 2019/09/02
- [bug#36477] [PATCH v3 34/48] gnu: guile-wm: Fix cross-compilation., Mathieu Othacehe, 2019/09/02
- [bug#36477] [PATCH v3 36/48] gnu: console-setup: Fix cross-compilation., Mathieu Othacehe, 2019/09/02
- [bug#36477] [PATCH v3 26/48] gnu: guile-sqlite3: Fix cross-compilation., Mathieu Othacehe, 2019/09/02
- [bug#36477] [PATCH v3 37/48] gnu: mdadm: Fix cross-compilation., Mathieu Othacehe, 2019/09/02
- [bug#36477] [PATCH v3 38/48] gnu: grub: Fix cross-compilation.,
Mathieu Othacehe <=
- [bug#36477] [PATCH v3 44/48] build: vm: Fix arm32 support., Mathieu Othacehe, 2019/09/02
- [bug#36477] [PATCH v3 46/48] system: vm: Support cross-compilation., Mathieu Othacehe, 2019/09/02
- [bug#36477] [PATCH v3 42/48] gexp: Pass target to compiled-modules in lower-gexp., Mathieu Othacehe, 2019/09/02
- [bug#36477] [PATCH v3 43/48] utils: Use target-arm64? and target-arm? helpers., Mathieu Othacehe, 2019/09/02
- [bug#36477] [PATCH v3 40/48] gnu: linux-libre: Enable built-in ext4 support., Mathieu Othacehe, 2019/09/02