[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
41/58: gnu: cairo: Support building for the Hurd.
From: |
guix-commits |
Subject: |
41/58: gnu: cairo: Support building for the Hurd. |
Date: |
Wed, 19 Jul 2023 03:00:50 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit a7565e5bdc1affadb26b0df93165341756b8bf46
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 e52940d0fc..848ed91d96 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)
- 31/58: gnu: cmake-minimal: Skip tests on the Hurd., (continued)
- 31/58: gnu: cmake-minimal: Skip tests on the Hurd., guix-commits, 2023/07/19
- 36/58: gnu: harfbuzz: Support build for the Hurd., guix-commits, 2023/07/19
- 37/58: gnu: pango: Support build for the Hurd., guix-commits, 2023/07/19
- 43/58: gnu: hurd: Support native build on the Hurd., guix-commits, 2023/07/19
- 44/58: gnu: guix: Disable some test on 32bit., guix-commits, 2023/07/19
- 39/58: gnu: po4a: Skip failing test on the Hurd., guix-commits, 2023/07/19
- 50/58: build: Build gnu/packages/*.go in five steps., guix-commits, 2023/07/19
- 47/58: hurd-boot: Support system init: Create essential device nodes., guix-commits, 2023/07/19
- 46/58: hurd: Support system init in /libexec/runsystem., guix-commits, 2023/07/19
- 06/58: gnu: findutils: Move test-strerror_r from XFAIL to skip on the Hurd., guix-commits, 2023/07/19
- 41/58: gnu: cairo: Support building for the Hurd.,
guix-commits <=
- 04/58: gnu: grep: Update hanging and failing tests on the Hurd., guix-commits, 2023/07/19
- 35/58: gnu: ghostscript: Fix build for the Hurd., guix-commits, 2023/07/19
- 42/58: gnu: glib: Disable tests for the Hurd., guix-commits, 2023/07/19
- 58/58: locale: Set %default-locale-definitions to glibc/hurd on the Hurd., guix-commits, 2023/07/19
- 26/58: gnu: ruby-2.6: Skip test on the Hurd., guix-commits, 2023/07/19
- 29/58: gnu: zstd: Skip tests when building for the Hurd., guix-commits, 2023/07/19
- 33/58: gnu: graphite2: Skip test on the Hurd., guix-commits, 2023/07/19
- 49/58: system: hurd: Add swap-services to hurd-default-essential-services., guix-commits, 2023/07/19
- 45/58: gnu: guix: Disable some tests on the Hurd., guix-commits, 2023/07/19
- 53/58: gnu: guix: Update to 1.4.0-9.2a8bf3da1e., guix-commits, 2023/07/19