[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
34/65: gnu: cairo: Support building for the Hurd.
From: |
guix-commits |
Subject: |
34/65: gnu: cairo: Support building for the Hurd. |
Date: |
Fri, 14 Jul 2023 10:06:02 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit fb081a59900ba8c7d1ca730f195d49ce9bc388b3
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)
- 02/65: gnu: commencement: Add automake-boot0., (continued)
- 02/65: gnu: commencement: Add automake-boot0., guix-commits, 2023/07/14
- 08/65: gnu: guile: Skip hanging and failing pipe tests on the Hurd., guix-commits, 2023/07/14
- 28/65: gnu: git: Skip failing test on the Hurd., guix-commits, 2023/07/14
- 06/65: gnu: commencement: hurd-minimal-boot0: Update to 0.9.git20230216., guix-commits, 2023/07/14
- 14/65: gnu: gettext-minimal: Remove XFAIL_TESTS for the Hurd., guix-commits, 2023/07/14
- 20/65: gnu: mpfr: Skip failing test on the Hurd., guix-commits, 2023/07/14
- 23/65: gnu: c-ares: Skip failing tests on the Hurd., guix-commits, 2023/07/14
- 24/65: gnu: libgpg-error: Skip failing test on the Hurd., guix-commits, 2023/07/14
- 27/65: gnu: curl: Skip failing test on the Hurd., guix-commits, 2023/07/14
- 25/65: gnu: libgcrypt: Skip hanging benchmark tests on the Hurd., guix-commits, 2023/07/14
- 34/65: gnu: cairo: Support building for the Hurd.,
guix-commits <=
- 35/65: gnu: openssl-1.1: Fix shared build for the Hurd., guix-commits, 2023/07/14
- 36/65: gnu: ruby-2.6: Skip test on the Hurd., guix-commits, 2023/07/14
- 39/65: gnu: zstd: Skip tests when building for the Hurd., guix-commits, 2023/07/14
- 42/65: gnu: doxygen: Fix build for the Hurd., guix-commits, 2023/07/14
- 51/65: gnu: guile-2.0: Skip failing tests on the Hurd., guix-commits, 2023/07/14
- 55/65: build: Build gnu/packages/*.go in five steps., guix-commits, 2023/07/14
- 60/65: gnu: guix: Update to 1.4.0-9.5165f041af., guix-commits, 2023/07/14
- 64/65: gnu: Add libc-locales-for-target and glibc-locales/hurd., guix-commits, 2023/07/14
- 21/65: gnu: elfutils: Skip failing tests on the Hurd., guix-commits, 2023/07/14
- 30/65: gnu: procps: Skip linux-version test for the Hurd., guix-commits, 2023/07/14