guix-commits
[Top][All Lists]
Advanced

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

36/52: gnu: avahi: Use the cross-compiled bash.


From: guix-commits
Subject: 36/52: gnu: avahi: Use the cross-compiled bash.
Date: Mon, 20 Sep 2021 07:19:37 -0400 (EDT)

mothacehe pushed a commit to branch core-updates-frozen
in repository guix.

commit 0636f02b0e33aed9b2f951bc91ded0fe8a7d1654
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Wed Aug 25 13:53:22 2021 +0200

    gnu: avahi: Use the cross-compiled bash.
    
    * gnu/packages/avahi.scm (avahi)[arguments]<#:phases>{patch-more-shebangs}:
      Replace the bash in the shebangs in "/etc/avahi" with a cross-compiled 
bash.
---
 gnu/packages/avahi.scm | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm
index 5582df4..7dcaa17 100644
--- a/gnu/packages/avahi.scm
+++ b/gnu/packages/avahi.scm
@@ -23,9 +23,11 @@
 (define-module (gnu packages avahi)
   #:use-module ((guix licenses) #:select (lgpl2.1+))
   #:use-module (guix packages)
+  #:use-module (guix gexp)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages)
+  #:use-module (gnu packages bash)
   #:use-module (gnu packages dbm)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
@@ -72,9 +74,28 @@
                            "--enable-compat-libdns_sd"
                            ,@(if (%current-target-system)
                                  '("ac_cv_prog_have_pkg_config=yes")
-                                 '()))))
+                                 '()))
+       ;; TODO(core-updates): Make this unconditional.
+       ,@(if (%current-target-system)
+             `(#:modules ((srfi srfi-26)
+                          (guix build utils)
+                          (guix build gnu-build-system))
+               #:phases
+               ,#~(modify-phases %standard-phases
+                    (add-after 'patch-shebangs 'patch-more-shebangs
+                      (lambda* (#:key inputs #:allow-other-keys)
+                        (define path
+                          `(,(dirname (search-input-file inputs "bin/sh"))))
+                        (for-each
+                         (cut patch-shebang <> path)
+                         (find-files (string-append #$output 
"/etc/avahi")))))))
+             '())))
     (inputs
-     `(("dbus" ,dbus)
+     ;; TODO(core-updates): Make this input unconditional.
+     `(,@(if (%current-target-system)
+             `(("bash-minimal" ,bash-minimal))
+             '())
+       ("dbus" ,dbus)
        ("expat" ,expat)
        ("gdbm" ,gdbm)
        ("glib" ,glib)



reply via email to

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