me/guix
Archived
1
0
Fork 0
Code Activity

gnu: cairo: Fix cross-compilation.

Browse source 
* 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>
This commit is contained in:
Zheng Junjie 2024-04-24 12:34:25 +08:00
parent 58be9a79e2
commit ecfd88cbe3
No known key found for this signature in database
GPG key ID: 3B5AA993E1A2DFF0
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gnu/packages/gtk.scm
View file

@ -34,7 +34,7 @@
;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> ;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com> ;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;; Copyright © 2023 Sergiu Ivanov <sivanov@colimite.fr> ;;; 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 © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2024 John Kehayias <john.kehayias@protonmail.com> ;;; 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 `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html
#:glib-or-gtk? #t #:glib-or-gtk? #t
#:configure-flags #: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 (native-inputs
`(,@(if (target-hurd?) `(,@(if (target-hurd?)
'() '()