[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
35/66: gnu: cairo: Support building for the Hurd.
From: |
guix-commits |
Subject: |
35/66: gnu: cairo: Support building for the Hurd. |
Date: |
Fri, 14 Jul 2023 17:56:41 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit a27f7d7e7af3e8c2c1e80915cf86d72e2ea54ca3
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)
- 18/66: hurd-boot: Support system init: Create essential device nodes., (continued)
- 18/66: hurd-boot: Support system init: Create essential device nodes., guix-commits, 2023/07/14
- 37/66: gnu: ruby-2.6: Skip test on the Hurd., guix-commits, 2023/07/14
- 38/66: gnu: tcsh: Skip substitution tests on the Hurd., guix-commits, 2023/07/14
- 39/66: gnu: swig: Skip tests when building for the Hurd., guix-commits, 2023/07/14
- 04/66: gnu: commencement: gnumach-headers-boot0: Update to 1.8+git20221224., guix-commits, 2023/07/14
- 09/66: gnu: guile: Skip hanging and failing pipe tests on the Hurd., guix-commits, 2023/07/14
- 21/66: gnu: mpfr: Skip failing test on the Hurd., guix-commits, 2023/07/14
- 28/66: gnu: curl: Skip failing test on the Hurd., guix-commits, 2023/07/14
- 31/66: gnu: procps: Skip linux-version test for the Hurd., guix-commits, 2023/07/14
- 32/66: gnu: e2fsprogs: Skip failing tests on the Hurd., guix-commits, 2023/07/14
- 35/66: gnu: cairo: Support building for the Hurd.,
guix-commits <=
- 36/66: gnu: openssl-1.1: Fix shared build for the Hurd., guix-commits, 2023/07/14
- 43/66: gnu: doxygen: Fix build for the Hurd., guix-commits, 2023/07/14
- 44/66: gnu: graphite2: Skip test on the Hurd., guix-commits, 2023/07/14
- 46/66: gnu: glib: Disable tests for the Hurd., guix-commits, 2023/07/14
- 47/66: gnu: ghostscript: Fix build for the Hurd., guix-commits, 2023/07/14
- 49/66: gnu: pango: Support build for the Hurd., guix-commits, 2023/07/14
- 48/66: gnu: harfbuzz: Support build for the Hurd., guix-commits, 2023/07/14
- 50/66: gnu: fontforge: Support build on the Hurd., guix-commits, 2023/07/14
- 55/66: gnu: hurd: Support native build on the Hurd., guix-commits, 2023/07/14
- 60/66: gnu: guix: Update to 1.4.0-8.51376bc6f6., guix-commits, 2023/07/14