[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
25/43: gnu: cairo: Support building for the Hurd.
From: |
guix-commits |
Subject: |
25/43: gnu: cairo: Support building for the Hurd. |
Date: |
Thu, 20 Jul 2023 04:22:28 -0400 (EDT) |
janneke pushed a commit to branch master
in repository guix.
commit 69142dbea4eb5148ed165b494cae0ad730bf5514
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 8e9a9dc8b2..c5ec7bcdc2 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)
- 06/43: gnu: findutils: Move test-strerror_r from XFAIL to skip on the Hurd., (continued)
- 06/43: gnu: findutils: Move test-strerror_r from XFAIL to skip on the Hurd., guix-commits, 2023/07/20
- 07/43: gnu: diffutils: Remove test-perror2 from XFAIL_TESTS on the Hurd., guix-commits, 2023/07/20
- 12/43: gnu: mpfr: Skip failing test on the Hurd., guix-commits, 2023/07/20
- 13/43: gnu: elfutils: Skip failing tests on the Hurd., guix-commits, 2023/07/20
- 14/43: gnu: libbsd: Skip failing test on the Hurd., guix-commits, 2023/07/20
- 18/43: gnu: tcl: Remove failing tests on the Hurd.., guix-commits, 2023/07/20
- 21/43: gnu: procps: Skip linux-version test for the Hurd., guix-commits, 2023/07/20
- 22/43: gnu: e2fsprogs: Skip failing tests on the Hurd., guix-commits, 2023/07/20
- 23/43: gnu: parted: Disable tests for the Hurd., guix-commits, 2023/07/20
- 24/43: gnu: libpaper: Disable tests for the Hurd., guix-commits, 2023/07/20
- 25/43: gnu: cairo: Support building for the Hurd.,
guix-commits <=
- 26/43: gnu: openssl-1.1: Fix shared build for the Hurd., guix-commits, 2023/07/20
- 27/43: gnu: ruby-2.6: Skip test on the Hurd., guix-commits, 2023/07/20
- 28/43: gnu: tcsh: Skip substitution tests on the Hurd., guix-commits, 2023/07/20
- 32/43: gnu: cmake-minimal: Skip tests on the Hurd., guix-commits, 2023/07/20
- 33/43: gnu: doxygen: Fix build for the Hurd., guix-commits, 2023/07/20
- 15/43: gnu: c-ares: Skip failing tests on the Hurd., guix-commits, 2023/07/20
- 29/43: gnu: swig: Skip tests when building for the Hurd., guix-commits, 2023/07/20
- 39/43: gnu: pango: Support build for the Hurd., guix-commits, 2023/07/20
- 19/43: gnu: curl: Skip failing test on the Hurd., guix-commits, 2023/07/20
- 30/43: gnu: zstd: Skip tests when building for the Hurd., guix-commits, 2023/07/20