[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
63/89: gnu: cairo: Support building for the Hurd.
From: |
guix-commits |
Subject: |
63/89: gnu: cairo: Support building for the Hurd. |
Date: |
Tue, 20 Jun 2023 05:59:00 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit 7b5686210dcad154b114b7db1b773ff8de29df36
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Sun Jun 11 12:35:50 2023 +0200
gnu: cairo: Support building for the Hurd.
Gobject-introspection and libdrm does not build for the Hurd. Poppler
depends
on nss, which does not build for the Hurd.
* gnu/packages/gtk.scm (cairo)[native-inputs]: When building for the Hurd,
do
not include gobject-introspection.
[inputs]: Likewise, do not include libdrm, poppler.
---
gnu/packages/gtk.scm | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index ca41612e90..8a8415001a 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -35,6 +35,7 @@
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;; Copyright © 2023 Sergiu Ivanov <sivanov@colimite.fr>
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -194,15 +195,21 @@ such as mate-panel and xfce4-panel.")
(assoc-ref %outputs "doc")
"/share/gtk-doc/html"))))
(native-inputs
- `(("gobject-introspection" ,gobject-introspection)
+ `(,@(if (target-hurd?)
+ '()
+ `(("gobject-introspection" ,gobject-introspection)))
("pkg-config" ,pkg-config)
("python" ,python-wrapper)))
(inputs
`(("bash-minimal" ,bash-minimal) ;for glib-or-gtk-wrap
- ("drm" ,libdrm)
+ ,@(if (target-hurd?)
+ '()
+ `(("drm" ,libdrm)))
("ghostscript" ,ghostscript)
("libspectre" ,libspectre)
- ("poppler" ,poppler)))
+ ,@(if (target-hurd?)
+ '()
+ `(("poppler" ,poppler)))))
(propagated-inputs
`( ;; ("cogl" ,cogl)
;; ("directfb" ,directfb)
- 15/89: gnu: hurd: Update libpciaccess to 0.17., (continued)
- 15/89: gnu: hurd: Update libpciaccess to 0.17., guix-commits, 2023/06/20
- 17/89: gnu: hurd-minimal: Include libshouldbeinlibc and libstore., guix-commits, 2023/06/20
- 24/89: gnu: gnumach: Support "noide" argument., guix-commits, 2023/06/20
- 25/89: gnu: netdde: Resurrect and update to 2.6.32.65-2-e67c284ac1., guix-commits, 2023/06/20
- 26/89: hurd-boot: Cater for netdde., guix-commits, 2023/06/20
- 27/89: system: hurd: Add netdde to %base-packages/hurd., guix-commits, 2023/06/20
- 29/89: gnu: gnumach: Disable builtin networking., guix-commits, 2023/06/20
- 30/89: gnu: commencement: Add autoconf-boot0., guix-commits, 2023/06/20
- 53/89: gnu: libgpg-error: Skip failing test on the Hurd., guix-commits, 2023/06/20
- 64/89: gnu: openssl-1.1: Fix shared build for the Hurd., guix-commits, 2023/06/20
- 63/89: gnu: cairo: Support building for the Hurd.,
guix-commits <=
- 39/89: gnu: grep: Update hanging and failing tests on the Hurd., guix-commits, 2023/06/20
- 45/89: hurd: Support system init in /libexec/runsystem., guix-commits, 2023/06/20
- 71/89: gnu: doxygen: Fix build for the Hurd., guix-commits, 2023/06/20
- 41/89: gnu: findutils: Move test-strerror_r from XFAIL to skip on the Hurd., guix-commits, 2023/06/20
- 69/89: gnu: cmake-bootstrap: Fix build for the Hurd., guix-commits, 2023/06/20
- 35/89: gnu: commencement: hurd-minimal-boot0: Update to 0.9.git20230216., guix-commits, 2023/06/20
- 52/89: gnu: c-ares: Skip failing tests on the Hurd., guix-commits, 2023/06/20
- 38/89: gnu: coreutils: Skip hanging and failing test on the Hurd., guix-commits, 2023/06/20
- 58/89: gnu: emacs: Depend on libc-for-target., guix-commits, 2023/06/20
- 67/89: gnu: swig: Skip tests when building for the Hurd., guix-commits, 2023/06/20