[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
63/85: gnu: cairo: Support building for the Hurd.
From: |
guix-commits |
Subject: |
63/85: gnu: cairo: Support building for the Hurd. |
Date: |
Thu, 15 Jun 2023 02:32:43 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit 8d9ec1d2c5b90204f61baea58a4297f40b4653f6
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)
- 83/85: DRAFT hurd: Support second boot., (continued)
- 83/85: DRAFT hurd: Support second boot., guix-commits, 2023/06/15
- 42/85: gnu: diffutils: Remove test-perror2 from XFAIL_TESTS for the Hurd., guix-commits, 2023/06/15
- 65/85: gnu: ruby-2.6: Skip test for the Hurd., guix-commits, 2023/06/15
- 61/85: gnu: parted: Disable tests for the Hurd., guix-commits, 2023/06/15
- 16/85: gnu: Add rumpkernel., guix-commits, 2023/06/15
- 31/85: gnu: commencement: Add automake-boot0., guix-commits, 2023/06/15
- 62/85: gnu: libpaper: Disable tests for the Hurd., guix-commits, 2023/06/15
- 53/85: gnu: libgpg-error: Skip failing test for the Hurd., guix-commits, 2023/06/15
- 60/85: gnu: e2fsprogs: Skip failing tests for the Hurd., guix-commits, 2023/06/15
- 80/85: gnu: guile-2.0: Skip failing tests for the Hurd., guix-commits, 2023/06/15
- 63/85: gnu: cairo: Support building for the Hurd.,
guix-commits <=
- 67/85: gnu: swig: Skip tests when building for the Hurd., guix-commits, 2023/06/15
- 73/85: gnu: guile-git: Skip http proxy test for the Hurd., guix-commits, 2023/06/15
- 54/85: gnu: libgcrypt: Skip hanging benchmark tests for the Hurd., guix-commits, 2023/06/15
- 57/85: gnu: git: Skip failing test for the Hurd., guix-commits, 2023/06/15
- 66/85: gnu: tcsh: Skip substitution tests for the Hurd., guix-commits, 2023/06/15
- 56/85: gnu: curl: Skip failing test for the Hurd., guix-commits, 2023/06/15
- 70/85: gnu: cmake-minimal: Skip tests for the Hurd., guix-commits, 2023/06/15
- 72/85: gnu: graphite2: Skip test for the Hurd., guix-commits, 2023/06/15
- 77/85: gnu: pango: Support build for the Hurd., guix-commits, 2023/06/15
- 85/85: DRAFT system: examples: Add devel-hurd.tmpl., guix-commits, 2023/06/15