guix-commits
[Top][All Lists]
Advanced

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

02/03: gnu: luit: Fix invalid locale.alias location.


From: guix-commits
Subject: 02/03: gnu: luit: Fix invalid locale.alias location.
Date: Mon, 11 Jul 2022 15:08:38 -0400 (EDT)

apteryx pushed a commit to branch master
in repository guix.

commit df44d359f368e17e87f73a23694fab43e5d0f6ab
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Mon Jul 11 15:06:19 2022 -0400

    gnu: luit: Fix invalid locale.alias location.
    
    Fixes <https://issues.guix.gnu.org/43592>.
    
    * gnu/packages/xorg.scm (mkfontscale)[configure-flags]: Point to libx11's
    locale.alias file via the '--with-localealiasfile' configure option.
    [inputs]{libx11}: New input.
---
 gnu/packages/xorg.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 35bcbead39..d44bd52f54 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -1548,8 +1548,14 @@ treat it as part of their software base when porting.")
        ;; should become obsolete with the next release.
        (patches (search-patches "luit-posix.patch"))))
     (build-system gnu-build-system)
+    (arguments
+     (list
+      #:configure-flags
+      #~(list (string-append "--with-localealiasfile="
+                             (search-input-file
+                              %build-inputs 
"share/X11/locale/locale.alias")))))
     (inputs
-     (list libfontenc))
+     (list libfontenc libx11))
     (native-inputs
      (list pkg-config))
     (home-page "https://www.x.org/wiki/";)



reply via email to

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