From ecfd88cbe34551ebdae92c7c6bb5888bbd0993d6 Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Wed, 24 Apr 2024 12:34:25 +0800 Subject: [PATCH] gnu: cairo: Fix cross-compilation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gtk.scm (cairo)[arguments]: Add ‘fix-cross-compilation’ phase when cross-compiling. Change-Id: I3579bb1249c749ee5f164bb4dd47f585b181c2bc Signed-off-by: Zheng Junjie --- gnu/packages/gtk.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 7367be1d1a..fdf1fd9251 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -34,7 +34,7 @@ ;;; Copyright © 2022 Denis 'GNUtoo' Carikli ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2023 Sergiu Ivanov -;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 Janneke Nieuwenhuizen ;;; Copyright © 2024 John Kehayias ;;; @@ -182,7 +182,19 @@ such as mate-panel and xfce4-panel.") `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html #:glib-or-gtk? #t #:configure-flags - (list "-Dtests=disabled"))) + (list "-Dtests=disabled") + ,@(if (%current-target-system) + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-cross-compilation + (lambda _ + ;; XXX: Let meson-build-system customize the property + (substitute* "meson.build" + (("'ipc_rmid_deferred_release', 'auto'") + ;; see https://github.com/NixOS/nixpkgs/blob/df51f2293e935e85f6a2e69bcf89a40cb31bbc3d/pkgs/development/libraries/cairo/default.nix#L65 + ;; XXX: check it on hurd. + "'ipc_rmid_deferred_release', 'true'")))))) + '()))) (native-inputs `(,@(if (target-hurd?) '()