[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
53/61: gnu: grub: Fix cross-compilation.
From: |
guix-commits |
Subject: |
53/61: gnu: grub: Fix cross-compilation. |
Date: |
Wed, 21 Aug 2019 04:24:57 -0400 (EDT) |
mothacehe pushed a commit to branch wip-cross-system
in repository guix.
commit 69d04ede99c45e95876816d58353cca32bba80a3
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'.
- 39/61: gnu: make-linux-libre: Fix cross-compilation., (continued)
- 39/61: gnu: make-linux-libre: Fix cross-compilation., guix-commits, 2019/08/21
- 16/61: gnu: groff: Fix cross compilation., guix-commits, 2019/08/21
- 24/61: gnu: xmlto: Fix cross-compilation., guix-commits, 2019/08/21
- 26/61: gnu: tcsh: Fix cross-compilation., guix-commits, 2019/08/21
- 32/61: gnu: boost: Fix cross-compilation., guix-commits, 2019/08/21
- 30/61: gnu: icu4c: Fix cross-compilation., guix-commits, 2019/08/21
- 41/61: gnu: doxygen: Fix cross-compilation., guix-commits, 2019/08/21
- 42/61: gnu: guile-sqlite3: Fix cross-compilation., guix-commits, 2019/08/21
- 48/61: gnu: guile-xcb: Fix cross-compilation., guix-commits, 2019/08/21
- 51/61: gnu: console-setup: Fix cross-compilation., guix-commits, 2019/08/21
- 53/61: gnu: grub: Fix cross-compilation.,
guix-commits <=
- 43/61: gnu: guile-gcrypt: Fix cross-compilation., guix-commits, 2019/08/21
- 56/61: gexp: Use cross extensions when cross-compiling., guix-commits, 2019/08/21
- 59/61: system: vm: Add arm64 support., guix-commits, 2019/08/21
- 61/61: scripts: system: Add --target option., guix-commits, 2019/08/21
- 25/61: gnu: libarchive: Fix cross-compilation., guix-commits, 2019/08/21
- 29/61: gnu: alsa-utils: Fix cross-compilation., guix-commits, 2019/08/21
- 21/61: gnu: mit-krb5: Fix cross-compilation., guix-commits, 2019/08/21
- 20/61: gnu: libsamplerate: Fix aarch64 cross-compilation., guix-commits, 2019/08/21
- 23/61: gnu: help2man: Fix cross-compilation., guix-commits, 2019/08/21
- 33/61: gnu: eudev: Fix cross-compilation., guix-commits, 2019/08/21