[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/06: gnu: foot: Fix cross-compilation.
From: |
guix-commits |
Subject: |
03/06: gnu: foot: Fix cross-compilation. |
Date: |
Mon, 13 May 2024 12:29:39 -0400 (EDT) |
z572 pushed a commit to branch master
in repository guix.
commit 40af021e28102d2f4b2e4b2b3c302f487cb1f591
Author: Zheng Junjie <zhengjunjie@iscas.ac.cn>
AuthorDate: Wed Mar 20 00:38:17 2024 +0800
gnu: foot: Fix cross-compilation.
* gnu/packages/terminals.scm (foot): Fix cross-compilation.
[arguments]<#:configure-flags>: When cross-compilation, Remove -Db_lto=true.
[native-inputs]: When cross-compilation, Add wayland, pkg-config-for-build.
[inputs]: Add wayland-protocols.
Change-Id: Ia56d2583254bd9ab463e5b39859eae8eb5092c9b
---
gnu/packages/terminals.scm | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index d18a042785..1c1294f663 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -36,7 +36,7 @@
;;; Copyright © 2022, 2023 jgart <jgart@dismail.de>
;;; Copyright © 2023 Aaron Covrig <aaron.covrig.us@ieee.org>
;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com>
-;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com>
;;; Copyright © 2024 Suhail <suhail@bayesians.ca>
;;; Copyright © 2024 Clément Lassieur <clement@lassieur.org>
@@ -865,16 +865,23 @@ eye-candy, customizable, and reasonably lightweight.")
;; also to address a GCC 10 issue when doing PGO builds.
#:build-type "release"
;; Enable LTO as recommended by INSTALL.md.
- #:configure-flags #~'("-Db_lto=true")))
- (native-inputs (list ncurses ;for 'tic'
- pkg-config scdoc wayland-protocols))
+ ;; when cross-compilation, enable lto will fail.
+ #:configure-flags (if (%current-target-system)
+ #~'()
+ #~'("-Db_lto=true"))))
+ (native-inputs (append
+ (if (%current-target-system)
+ (list wayland pkg-config-for-build)
+ '())
+ (list ncurses ;for 'tic'
+ pkg-config scdoc wayland-protocols)))
(native-search-paths
;; FIXME: This should only be located in 'ncurses'. Nonetheless it is
;; provided for usability reasons. See <https://bugs.gnu.org/22138>.
(list (search-path-specification
(variable "TERMINFO_DIRS")
(files '("share/terminfo")))))
- (inputs (list fcft libxkbcommon wayland))
+ (inputs (list fcft libxkbcommon wayland wayland-protocols))
(synopsis "Wayland-native terminal emulator")
(description
"@command{foot} is a terminal emulator for systems using the Wayland
- branch master updated (58be9a79e2 -> b23aa4c1d6), guix-commits, 2024/05/13
- 01/06: gnu: cairo: Fix cross-compilation., guix-commits, 2024/05/13
- 06/06: gnu: Add tree-sitter-erlang., guix-commits, 2024/05/13
- 02/06: gnu: utf8proc: fix cross-compilation., guix-commits, 2024/05/13
- 04/06: gnu: Add tree-sitter-verilog., guix-commits, 2024/05/13
- 03/06: gnu: foot: Fix cross-compilation.,
guix-commits <=
- 05/06: gnu: Add tree-sitter-vhdl., guix-commits, 2024/05/13