summary refs log tree commit diff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2023-05-28 14:43:15 +0300
committerEfraim Flashner <efraim@flashner.co.il>2023-05-28 14:43:15 +0300
commitef5a05bac8a539268c564f392d85ab707fdb3843 (patch)
tree038da082a220194e63f1e8061dba0dc31bf65f62
parent6192acf8b77948384e75650ae79dfbaadb26bc37 (diff)
downloadguix-ef5a05bac8a539268c564f392d85ab707fdb3843.tar.gz
gnu: guix: Fix cross-building.
* gnu/packages/package-management.scm (guix)[arguments]: In custom
'set-font-path phase also search native-inputs for the input directory.
-rw-r--r--gnu/packages/package-management.scm4
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index b3acbc272f..08b97bec2f 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -275,11 +275,11 @@ $(prefix)/etc/openrc\n")))
                                (string-append "\"" xz "/bin/xz")))))
                         #t))
                     (add-before 'build 'set-font-path
-                      (lambda* (#:key inputs #:allow-other-keys)
+                      (lambda* (#:key native-inputs inputs #:allow-other-keys)
                         ;; Tell 'dot' where to look for fonts.
                         (setenv "XDG_DATA_DIRS"
                                 (dirname
-                                 (search-input-directory inputs
+                                 (search-input-directory (or native-inputs inputs)
                                                          "share/fonts")))))
                     (add-before 'check 'copy-bootstrap-guile
                       (lambda* (#:key system target inputs #:allow-other-keys)