From c3a3a4a7619456a60caf4e2dc3be91dc6adc3a2e Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Tue, 24 Aug 2021 15:23:53 +0200 Subject: gnu: gamin: Recognise aarch64 as architecture when cross-compiling. * gnu/packages/gnome.scm (gamin)[arguments]<#:phases>{replace-config.sub}: Update 'config.sub' when cross-compiling. (gamin)[native-inputs]: Add "config" when cross-compiling. --- gnu/packages/gnome.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4a6266786a..5e24090b64 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -62,6 +62,7 @@ ;;; Copyright © 2021 Solene Rapenne ;;; Copyright © 2021 Guillaume Le Vaillant ;;; Copyright © 2021 Felix Gruber +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -11244,6 +11245,13 @@ repository and commit your work.") (arguments `(#:phases (modify-phases %standard-phases + ;; The 'config.sub' is too old to recognise aarch64. + ,@(if (and=> (%current-target-system) target-aarch64?) + `((add-after 'unpack 'replace-config.sub + (lambda _ + (delete-file "config.sub") + (symlink (which "config.sub") "config.sub")))) + '()) (add-after 'unpack 'remove-deprecated-macro (lambda _ (substitute* '("server/gam_node.c" @@ -11255,7 +11263,10 @@ repository and commit your work.") (inputs `(("glib" ,glib))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ,@(if (and=> (%current-target-system) target-aarch64?) + `(("config" ,config)) + '()))) (home-page "https://people.gnome.org/~veillard/gamin/") (synopsis "File alteration monitor") (description -- cgit v1.2.3