diff mbox series

[bug#50905,core-updates,v2,28/38] gnu: avahi: Make the 'patch-more-shebangs' phase unconditional.

Message ID 20211001142140.17027-28-maximedevos@telenet.be
State Accepted
Headers show
Series [bug#50905,core-updates,v2,01/38] build-system/mozilla: New build system. | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue

Commit Message

M Oct. 1, 2021, 2:21 p.m. UTC 
* gnu/packages/avahi.scm (avahi)[arguments]<#:phases>{patch-more-shebangs}:
  Make it unconditional.
---
 gnu/packages/avahi.scm | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)
diff mbox series

Patch

diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm
index 20c0f2708e..797e35e7eb 100644
--- a/gnu/packages/avahi.scm
+++ b/gnu/packages/avahi.scm
@@ -75,21 +75,18 @@ 
                            ,@(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")))))))
-             '())))
+       #: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
      `(("bash-minimal" ,bash-minimal)
        ("dbus" ,dbus)