[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/05: gnu: grub: Fix cross-compilation.
From: |
guix-commits |
Subject: |
03/05: gnu: grub: Fix cross-compilation. |
Date: |
Fri, 20 Sep 2019 03:16:50 -0400 (EDT) |
mothacehe pushed a commit to branch core-updates-next
in repository guix.
commit 83dc2a10bedfb1776e4d77a6053cbb61c08dd20c
Author: Mathieu Othacehe <address@hidden>
Date: Sun Aug 18 13:02:21 2019 +0200
gnu: grub: Fix cross-compilation.
* 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 41a2de9..b235e1b 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'.
- branch core-updates-next updated (06cfcab -> efc835b), guix-commits, 2019/09/20
- 01/05: linux-initrd: Use native gzip., guix-commits, 2019/09/20
- 02/05: gnu: glibc-utf8-locales: Fix cross-compilation., guix-commits, 2019/09/20
- 03/05: gnu: grub: Fix cross-compilation.,
guix-commits <=
- 04/05: gnu: linux-libre: Enable built-in ext4 support., guix-commits, 2019/09/20
- 05/05: gnu: make-linux-libre: Fix cross-compilation., guix-commits, 2019/09/20
- core-updates-next is stale, Ludovic Courtès, 2019/09/20