[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
36/67: gnu: cairo: Support building for the Hurd.
From: |
guix-commits |
Subject: |
36/67: gnu: cairo: Support building for the Hurd. |
Date: |
Tue, 18 Jul 2023 09:27:17 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit 4b1f0820054ebeefd54024145e13550c4cb50a5a
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)
- 67/67: locale: Set %default-locale-definitions to glibc/hurd on the Hurd., (continued)
- 67/67: locale: Set %default-locale-definitions to glibc/hurd on the Hurd., guix-commits, 2023/07/18
- 05/67: gnu: commencement: mig-boot0: Update to 1.8+git20230520., guix-commits, 2023/07/18
- 11/67: gnu: coreutils: Skip hanging and failing test on the Hurd., guix-commits, 2023/07/18
- 01/67: gnu: commencement: Add autoconf-boot0., guix-commits, 2023/07/18
- 02/67: gnu: commencement: Add automake-boot0., guix-commits, 2023/07/18
- 06/67: gnu: commencement: hurd-headers-boot0: Update to 0.9.git20230216., guix-commits, 2023/07/18
- 07/67: gnu: commencement: hurd-minimal-boot0: Update to 0.9.git20230216., guix-commits, 2023/07/18
- 12/67: gnu: grep: Update hanging and failing tests on the Hurd., guix-commits, 2023/07/18
- 19/67: hurd-boot: Support system init: Create essential device nodes., guix-commits, 2023/07/18
- 23/67: gnu: elfutils: Skip failing tests on the Hurd., guix-commits, 2023/07/18
- 36/67: gnu: cairo: Support building for the Hurd.,
guix-commits <=
- 44/67: gnu: doxygen: Fix build for the Hurd., guix-commits, 2023/07/18
- 25/67: gnu: c-ares: Skip failing tests on the Hurd., guix-commits, 2023/07/18
- 38/67: gnu: ruby-2.6: Skip test on the Hurd., guix-commits, 2023/07/18
- 42/67: gnu: cmake-bootstrap: Fix build for 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
- 58/67: self: Build gnu/packages/*.go in 26 steps on the Hurd., guix-commits, 2023/07/18
- 59/67: gnu: guix: Disable some test on 32bit., guix-commits, 2023/07/18
- 61/67: gnu: guix: Update to 1.4.0-8.51376bc6f6., guix-commits, 2023/07/18
- 64/67: DRAFT hurd-boot: Support second boot., guix-commits, 2023/07/18