guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: gnu: json-glib: Fix cross-compiling.


From: guix-commits
Subject: branch master updated: gnu: json-glib: Fix cross-compiling.
Date: Mon, 08 Jan 2024 01:15:56 -0500

This is an automated email from the git hooks/post-receive script.

efraim pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 728d471d73 gnu: json-glib: Fix cross-compiling.
728d471d73 is described below

commit 728d471d73c3731b86cbf5f3dee22229d3a92d4b
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Sun Jan 7 22:21:19 2024 +0200

    gnu: json-glib: Fix cross-compiling.
    
    * gnu/packages/gnome.scm (json-glib)[native-inputs]: Only add more
    inputs when not cross-compiling.
    
    Change-Id: I987f382f02d9f7b79b6e281d1f6f6824c1b2dfd3
---
 gnu/packages/gnome.scm | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index b2d4b73088..b43e533769 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -11,7 +11,7 @@
 ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2023 Ricardo Wurmus 
<rekado@elephly.net>
 ;;; Copyright © 2015, 2016, 2017, 2018, 2021 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2015 David Thompson <davet@gnu.org>
-;;; Copyright © 2015-2023 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2015-2024 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016, 2017, 2018 Rene Saavedra <pacoon@protonmail.com>
 ;;; Copyright © 2016 Jochem Raat <jchmrt@riseup.net>
 ;;; Copyright © 2016, 2017, 2019 Kei Kebreau <kkebreau@posteo.net>
@@ -4781,12 +4781,15 @@ GLib and GObject, and integrates JSON with GLib data 
types.")
                            (string-append #$output:doc
                                           "/share/gtk-doc"))))))))))
     (native-inputs
-     (modify-inputs (package-native-inputs json-glib-minimal)
-       (prepend docbook-xml-4.3
-                docbook-xsl
-                gobject-introspection
-                gtk-doc
-                libxslt)))))
+     (if (%current-target-system)
+         ;; No docs, no additional inputs.
+         (package-native-inputs json-glib-minimal)
+         (modify-inputs (package-native-inputs json-glib-minimal)
+                        (prepend docbook-xml-4.3
+                                 docbook-xsl
+                                 gobject-introspection
+                                 gtk-doc
+                                 libxslt))))))
 
 (define-public libxklavier
   (package



reply via email to

[Prev in Thread] Current Thread [Next in Thread]