[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: gnu: system-config-printer: Fix build on riscv64-linux.
From: |
guix-commits |
Subject: |
02/02: gnu: system-config-printer: Fix build on riscv64-linux. |
Date: |
Mon, 27 May 2024 02:19:30 -0400 (EDT) |
efraim pushed a commit to branch master
in repository guix.
commit 3ccec0598dfb0cb3bd75317c94995529363eb352
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Sun May 26 11:42:24 2024 +0300
gnu: system-config-printer: Fix build on riscv64-linux.
* gnu/packages/gnome.scm (system-config-printer)[arguments]: When config
is an input add a phase to replace config.guess and config.sub.
[native-inputs]: Add config when building for riscv64-linux.
Change-Id: Iad0d2cbadd9c9f90b88e97e7690ad3b0ad0e6882
---
gnu/packages/gnome.scm | 34 ++++++++++++++++++++++++----------
1 file changed, 24 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index cbc2c97296..30d87e2b6c 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3019,6 +3019,16 @@ guidelines.")
(substitute* "Makefile.am"
(("/bin/bash") (which "bash")))
(delete-file "configure")))
+ #$@(if (this-package-native-input "config")
+ #~((add-after 'unpack 'update-config-scripts
+ (lambda* (#:key native-inputs inputs #:allow-other-keys)
+ (for-each (lambda (file)
+ (install-file
+ (search-input-file
+ (or native-inputs inputs)
+ (string-append "/bin/" file)) "."))
+ '("config.guess" "config.sub")))))
+ #~())
(add-after 'install 'add-install-to-pythonpath
(@@ (guix build python-build-system) add-install-to-pythonpath))
(add-after 'add-install-to-pythonpath 'wrap-for-python
@@ -3051,16 +3061,20 @@ guidelines.")
libnotify
packagekit))
(native-inputs
- (list pkg-config
- desktop-file-utils
- glib
- autoconf
- automake
- gettext-minimal
- xmlto
- docbook-xml-4.1.2
- docbook-xsl
- libxml2))
+ (append
+ (if (target-riscv64?)
+ (list config)
+ '())
+ (list pkg-config
+ desktop-file-utils
+ glib
+ autoconf
+ automake
+ gettext-minimal
+ xmlto
+ docbook-xml-4.1.2
+ docbook-xsl
+ libxml2)))
(home-page "https://github.com/zdohnal/system-config-printer")
(synopsis "CUPS administration tool")
(description