[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
34/67: gnu: cairo: Support building for the Hurd.
From: |
guix-commits |
Subject: |
34/67: gnu: cairo: Support building for the Hurd. |
Date: |
Tue, 18 Jul 2023 10:57:04 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit b9816b12ede7922cc392788e9d8d29758a7ff389
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 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 @@ 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)
- 64/67: DRAFT hurd-boot: Support second boot., (continued)
- 64/67: DRAFT hurd-boot: Support second boot., guix-commits, 2023/07/18
- 58/67: self: Build gnu/packages/*.go in 26 steps on the Hurd., guix-commits, 2023/07/18
- 50/67: gnu: po4a: Skip failing test on the Hurd., guix-commits, 2023/07/18
- 52/67: hurd: Support system init in /libexec/runsystem., guix-commits, 2023/07/18
- 02/67: gnu: commencement: Add automake-boot0., guix-commits, 2023/07/18
- 11/67: gnu: coreutils: Skip hanging and failing test on the Hurd., guix-commits, 2023/07/18
- 14/67: gnu: findutils: Move test-strerror_r from XFAIL to skip on the Hurd., guix-commits, 2023/07/18
- 18/67: gnu: openssl: Build fix for the Hurd., guix-commits, 2023/07/18
- 28/67: gnu: git: Skip failing test on the Hurd., guix-commits, 2023/07/18
- 38/67: gnu: swig: Skip tests when building for the Hurd., guix-commits, 2023/07/18
- 34/67: gnu: cairo: Support building for the Hurd.,
guix-commits <=
- 32/67: gnu: parted: Disable tests for the Hurd., guix-commits, 2023/07/18
- 40/67: gnu: cmake-bootstrap: Fix build for the Hurd., guix-commits, 2023/07/18
- 46/67: gnu: ghostscript: Fix build for the Hurd., guix-commits, 2023/07/18
- 63/67: DRAFT hurd: Support second boot., guix-commits, 2023/07/18
- 44/67: gnu: guile-git: Skip http proxy test on the Hurd., guix-commits, 2023/07/18
- 67/67: locale: Set %default-locale-definitions to glibc/hurd on the Hurd., guix-commits, 2023/07/18
- 54/67: system: hurd: Add procps to %base-packages/hurd., guix-commits, 2023/07/18
- 57/67: build: Build gnu/packages/*.go in five steps., guix-commits, 2023/07/18
- 56/67: gnu: hurd: Support native build on the Hurd., guix-commits, 2023/07/18
- 59/67: gnu: guix: Disable some test on 32bit., guix-commits, 2023/07/18