guix-commits
[Top][All Lists]
Advanced

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

04/05: gnu: guix: Keep dependency on Guile-Avahi when cross-compiling.


From: guix-commits
Subject: 04/05: gnu: guix: Keep dependency on Guile-Avahi when cross-compiling.
Date: Sun, 15 Jan 2023 18:09:43 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit 917b1e017aafa7b02b57445db0e8f4a8481ccd55
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sun Jan 15 23:50:43 2023 +0100

    gnu: guix: Keep dependency on Guile-Avahi when cross-compiling.
    
    * gnu/packages/package-management.scm (guix)[native-inputs]: Keep
    Guile-Avahi when cross-compiling, but drop it when 'hurd-target?' is true.
    [propagated-inputs]: Likewise.
---
 gnu/packages/package-management.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/package-management.scm 
b/gnu/packages/package-management.scm
index d12d5ae474..3ff680bffe 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013-2022 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013-2023 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015, 2017, 2020, 2021, 2022 Ricardo Wurmus 
<rekado@elephly.net>
 ;;; Copyright © 2017 Muriithi Frederick Muriuki <fredmanglis@gmail.com>
 ;;; Copyright © 2017, 2018 Oleg Pykhalov <go.wigust@gmail.com>
@@ -407,7 +407,7 @@ $(prefix)/etc/openrc\n")))
                        ;; cross-compilation.
                        ("guile" ,guile-3.0-latest) ;for faster builds
                        ("guile-gnutls" ,guile-gnutls)
-                       ,@(if (%current-target-system)
+                       ,@(if (hurd-target?)
                              '()
                              `(("guile-avahi" ,guile-avahi)))
                        ("guile-gcrypt" ,guile-gcrypt)
@@ -466,7 +466,7 @@ $(prefix)/etc/openrc\n")))
       (propagated-inputs
        `(("guile-gnutls" ,guile-gnutls)
          ;; Avahi requires "glib" which doesn't cross-compile yet.
-         ,@(if (%current-target-system)
+         ,@(if (hurd-target?)
                '()
                `(("guile-avahi" ,guile-avahi)))
          ("guile-gcrypt" ,guile-gcrypt)



reply via email to

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