[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
63/92: gnu: cairo: Support building for the Hurd.
From: |
guix-commits |
Subject: |
63/92: gnu: cairo: Support building for the Hurd. |
Date: |
Fri, 23 Jun 2023 12:45:44 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit 61c7b0148eea41519109acf0bcccf469adc5c8bc
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)
- 39/92: gnu: grep: Update hanging and failing tests on the Hurd., (continued)
- 39/92: gnu: grep: Update hanging and failing tests on the Hurd., guix-commits, 2023/06/23
- 40/92: Revert "gnu: sed: Skip failing test on GNU/Hurd.", guix-commits, 2023/06/23
- 41/92: gnu: findutils: Move test-strerror_r from XFAIL to skip on the Hurd., guix-commits, 2023/06/23
- 42/92: gnu: diffutils: Remove test-perror2 from XFAIL_TESTS on the Hurd., guix-commits, 2023/06/23
- 44/92: gnu: m4: Skip gnulib stack-overflow tests for the Hurd., guix-commits, 2023/06/23
- 47/92: gnu: openssl: Build fix for the Hurd., guix-commits, 2023/06/23
- 43/92: gnu: gettext-minimal: Remove XFAIL_TESTS for the Hurd., guix-commits, 2023/06/23
- 53/92: gnu: libgpg-error: Skip failing test on the Hurd., guix-commits, 2023/06/23
- 54/92: gnu: libgcrypt: Skip hanging benchmark tests on the Hurd., guix-commits, 2023/06/23
- 56/92: gnu: curl: Skip failing test on the Hurd., guix-commits, 2023/06/23
- 63/92: gnu: cairo: Support building for the Hurd.,
guix-commits <=
- 46/92: hurd-boot: Support system init: Create essential device nodes., guix-commits, 2023/06/23
- 49/92: gnu: mpfr: Skip failing test on the Hurd., guix-commits, 2023/06/23
- 52/92: gnu: c-ares: Skip failing tests on the Hurd., guix-commits, 2023/06/23
- 57/92: gnu: git: Skip failing test on the Hurd., guix-commits, 2023/06/23
- 61/92: gnu: parted: Disable tests for the Hurd., guix-commits, 2023/06/23
- 62/92: gnu: libpaper: Disable tests for the Hurd., guix-commits, 2023/06/23
- 65/92: gnu: ruby-2.6: Skip test on the Hurd., guix-commits, 2023/06/23
- 66/92: gnu: tcsh: Skip substitution tests on the Hurd., guix-commits, 2023/06/23
- 68/92: gnu: zstd: Skip tests when building for the Hurd., guix-commits, 2023/06/23
- 75/92: gnu: ghostscript: Fix build for the Hurd., guix-commits, 2023/06/23