[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#64711] [PATCH 26/43] gnu: cairo: Support building for the Hurd.
From: |
Janneke Nieuwenhuizen |
Subject: |
[bug#64711] [PATCH 26/43] gnu: cairo: Support building for the Hurd. |
Date: |
Tue, 18 Jul 2023 16:40:19 +0200 |
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 9621357b99..eb69a88221 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 @@ (define-public cairo
(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)
--
2.40.1
- [bug#64711] [PATCH 22/43] gnu: procps: Skip linux-version test for the Hurd., (continued)
- [bug#64711] [PATCH 22/43] gnu: procps: Skip linux-version test for the Hurd., Janneke Nieuwenhuizen, 2023/07/18
- [bug#64711] [PATCH 16/43] gnu: libgpg-error: Skip failing test on the Hurd., Janneke Nieuwenhuizen, 2023/07/18
- [bug#64711] [PATCH 24/43] gnu: parted: Disable tests for the Hurd., Janneke Nieuwenhuizen, 2023/07/18
- [bug#64711] [PATCH 11/43] gnu: python: Support native build on the Hurd., Janneke Nieuwenhuizen, 2023/07/18
- [bug#64711] [PATCH 21/43] gnu: emacs: Depend on libc-for-target., Janneke Nieuwenhuizen, 2023/07/18
- [bug#64711] [PATCH 27/43] gnu: openssl-1.1: Fix shared build for the Hurd., Janneke Nieuwenhuizen, 2023/07/18
- [bug#64711] [PATCH 23/43] gnu: e2fsprogs: Skip failing tests on the Hurd., Janneke Nieuwenhuizen, 2023/07/18
- [bug#64711] [PATCH 25/43] gnu: libpaper: Disable tests for the Hurd., Janneke Nieuwenhuizen, 2023/07/18
- [bug#64711] [PATCH 26/43] gnu: cairo: Support building for the Hurd.,
Janneke Nieuwenhuizen <=
- [bug#64711] [PATCH 26/43] gnu: cairo: Support building for the Hurd., Liliana Marie Prikler, 2023/07/18
- [bug#64711] [PATCH 26/43] gnu: cairo: Support building for the Hurd., Janneke Nieuwenhuizen, 2023/07/18
- [bug#64711] [PATCH 26/43] gnu: cairo: Support building for the Hurd., Maxim Cournoyer, 2023/07/18
- [bug#64711] [PATCH 26/43] gnu: cairo: Support building for the Hurd., Janneke Nieuwenhuizen, 2023/07/19
- [bug#64711] [PATCH 26/43] gnu: cairo: Support building for the Hurd., Maxim Cournoyer, 2023/07/19
- [bug#64711] [PATCH 26/43] gnu: cairo: Support building for the Hurd., Janneke Nieuwenhuizen, 2023/07/21
[bug#64711] [PATCH 29/43] gnu: tcsh: Skip substitution tests on the Hurd., Janneke Nieuwenhuizen, 2023/07/18
[bug#64711] [PATCH 38/43] gnu: ghostscript: Fix build for the Hurd., Janneke Nieuwenhuizen, 2023/07/18
[bug#64711] [PATCH 30/43] gnu: swig: Skip tests when building for the Hurd., Janneke Nieuwenhuizen, 2023/07/18
[bug#64711] [PATCH 42/43] gnu: po4a: Skip failing test on the Hurd., Janneke Nieuwenhuizen, 2023/07/18