[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
28/38: gnu: avahi: Make the 'patch-more-shebangs' phase unconditional.
From: |
guix-commits |
Subject: |
28/38: gnu: avahi: Make the 'patch-more-shebangs' phase unconditional. |
Date: |
Sat, 2 Oct 2021 12:52:44 -0400 (EDT) |
mothacehe pushed a commit to branch core-updates
in repository guix.
commit 40e07889d13ad447f8f79060a4b0c6d8febe3959
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Fri Oct 1 16:21:30 2021 +0200
gnu: avahi: Make the 'patch-more-shebangs' phase unconditional.
* gnu/packages/avahi.scm (avahi)[arguments]<#:phases>{patch-more-shebangs}:
Make it unconditional.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
---
gnu/packages/avahi.scm | 27 ++++++++++++---------------
1 file changed, 12 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm
index 20c0f27..797e35e 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)
- 16/38: gnu: libdatrie: Make input labels match the package name., (continued)
- 16/38: gnu: libdatrie: Make input labels match the package name., guix-commits, 2021/10/02
- 14/38: gnu: cairo: Make 'bash-minimal' input unconditional., guix-commits, 2021/10/02
- 15/38: gnu: libthai: Make 'datrie' input unconditional., guix-commits, 2021/10/02
- 17/38: gnu: pango: Make 'bash-minimal' input unconditional., guix-commits, 2021/10/02
- 13/38: gnu: gobject-introspection: Use python instead of python-wrapper., guix-commits, 2021/10/02
- 21/38: gnu: gdk-pixbuf: Make 'bash-minimal' input unconditional., guix-commits, 2021/10/02
- 20/38: gnu: gdk-pixbuf: Use target predicates., guix-commits, 2021/10/02
- 23/38: gnu: at-spi2-core: Make 'bash-minimal' input unconditional., guix-commits, 2021/10/02
- 26/38: gnu: at-spi2-core: Remove trailing #t., guix-commits, 2021/10/02
- 27/38: gnu: avahi: Make 'bash-minimal' input unconditional., guix-commits, 2021/10/02
- 28/38: gnu: avahi: Make the 'patch-more-shebangs' phase unconditional.,
guix-commits <=
- 29/38: gnu: freedesktop: Unconditionally use alternatives to % variables., guix-commits, 2021/10/02
- 30/38: gnu: wayland: Unconditionally lookup docbook in native-inputs., guix-commits, 2021/10/02
- 18/38: gnu: gdk-pixbuf: Unconditionally lookup docbook in native-inputs., guix-commits, 2021/10/02
- 22/38: gnu: gdk-pixbuf: Remove trailing #t., guix-commits, 2021/10/02
- 25/38: gnu: at-spi2-core: Unconditionally lookup docbook in native-inputs., guix-commits, 2021/10/02
- 12/38: gnu: gobject-introspection: Move things to native-inputs., guix-commits, 2021/10/02
- 19/38: gnu: gdk-pixbuf: Respect #:tests?., guix-commits, 2021/10/02
- 24/38: gnu: at-spi2-core: Respect #:tests?., guix-commits, 2021/10/02
- 32/38: gnu: json-glib: Make 'bash-minimal' input unconditional., guix-commits, 2021/10/02
- 34/38: gnu: heimdal: Make 'bash-minimal' input unconditional., guix-commits, 2021/10/02