03/03: gnu: cairo: Build without libdrm, poppler on the Hurd.

[guix-commits]

janneke pushed a commit to branch wip-hurd
in repository guix.

commit 95384bbbfc6028ae48ea0a67453d6cf9678d06e0
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Sun Jun 11 12:35:50 2023 +0200

    gnu: cairo: Build without libdrm, poppler on the Hurd.
    
    Libdrm does not build for the Hurd.  Poppler depends on nss, which does not
    build for the Hurd.
    
    * gnu/packages/gtk.scm (cairo)[inputs]: When building for the Hurd, do not
    include poppler.
---
 gnu/packages/gtk.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index ca41612e90..12779d23a3 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.
 ;;;
@@ -199,10 +200,14 @@ such as mate-panel and xfce4-panel.")
        ("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)