efraim pushed a commit to branch master
in repository guix.
commit 77b7d990ecff497653a2e5988497c6b00f5d2a37
Author: Efraim Flashner <[email protected]>
AuthorDate: Mon Nov 23 11:34:16 2020 +0200
gnu: grub: Fix cross-compiling for other architectures.
Reported by cbaines and xelxebar on IRC.
* gnu/packages/bootloaders.scm (grub)[arguments]: In custom
'set-freetype-variables phase only use the native-inputs version of
freetype.
---
gnu/packages/bootloaders.scm | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 12bc393..2e97099 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -138,14 +138,15 @@
;; These variables need to be set to the native versions
;; of the dependencies because they are used to build
;; programs which are executed during build time.
- (lambda* (#:key native-inputs inputs #:allow-other-keys)
- (let ((freetype (assoc-ref (or native-inputs inputs)
"freetype")))
- (setenv "BUILD_FREETYPE_LIBS"
- (string-append "-L" freetype
- "/lib -lfreetype"))
- (setenv "BUILD_FREETYPE_CFLAGS"
- (string-append "-I" freetype
- "/include/freetype2")))
+ (lambda* (#:key native-inputs #:allow-other-keys)
+ (when (assoc-ref native-inputs "freetype")
+ (let ((freetype (assoc-ref native-inputs "freetype")))
+ (setenv "BUILD_FREETYPE_LIBS"
+ (string-append "-L" freetype
+ "/lib -lfreetype"))
+ (setenv "BUILD_FREETYPE_CFLAGS"
+ (string-append "-I" freetype
+ "/include/freetype2"))))
#t))
(add-before 'check 'disable-flaky-test
(lambda _
