guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/02: gnu: guix: Fix cross-building.


From: guix-commits
Subject: 01/02: gnu: guix: Fix cross-building.
Date: Sun, 28 May 2023 12:01:10 -0400 (EDT)

efraim pushed a commit to branch master
in repository guix.

commit ef5a05bac8a539268c564f392d85ab707fdb3843
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Sun May 28 14:43:15 2023 +0300

    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.
---
 gnu/packages/package-management.scm | 4 ++--
 1 file 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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]