summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorZheng Junjie <zhengjunjie@iscas.ac.cn>2024-04-24 12:34:25 +0800
committerZheng Junjie <zhengjunjie@iscas.ac.cn>2024-05-14 00:24:12 +0800
commitecfd88cbe34551ebdae92c7c6bb5888bbd0993d6 (patch)
tree67650ae0b232b3297a5c662b5a58142b3aaf33db /gnu
parent58be9a79e2862d5fa9842d73f498ce2e5442b9ce (diff)
downloadguix-ecfd88cbe34551ebdae92c7c6bb5888bbd0993d6.tar.gz
gnu: cairo: Fix cross-compilation.
* gnu/packages/gtk.scm (cairo)[arguments]: Add ‘fix-cross-compilation’ phase
when cross-compiling.

Change-Id: I3579bb1249c749ee5f164bb4dd47f585b181c2bc
Signed-off-by: Zheng Junjie <zhengjunjie@iscas.ac.cn>
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/gtk.scm16
1 files 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 <GNUtoo@cyberdimension.org>
 ;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
 ;;; Copyright © 2023 Sergiu Ivanov <sivanov@colimite.fr>
-;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2024 John Kehayias <john.kehayias@protonmail.com>
 ;;;
@@ -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?)
              '()