[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#50905] [PATCH 28/38] gnu: avahi: Make the 'patch-more-shebangs' pha
From: |
Maxime Devos |
Subject: |
[bug#50905] [PATCH 28/38] gnu: avahi: Make the 'patch-more-shebangs' phase unconditional. |
Date: |
Thu, 30 Sep 2021 00:19:28 +0200 |
* 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 --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)
--
2.33.0
- [bug#50905] [PATCH 15/38] gnu: libthai: Make 'datrie' input unconditional., (continued)
- [bug#50905] [PATCH 15/38] gnu: libthai: Make 'datrie' input unconditional., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 18/38] gnu: gdk-pixbuf: Unconditionally lookup docbook in native-inputs., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 25/38] gnu: at-spi2-core: Unconditionally lookup docbook in native-inputs., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 24/38] gnu: at-spi2-core: Respect #:tests?., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 22/38] gnu: gdk-pixbuf: Remove trailing #t., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 31/38] gnu: json-glib: Unconditionally lookup docbook in native-inputs., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 34/38] gnu: heimdal: Make 'bash-minimal' input unconditional., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 36/38] gnu: libproxy: Respect #:tests?., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 37/38] build/qt-utils: Allow overriding the shell interpreter used., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 19/38] gnu: gdk-pixbuf: Respect #:tests?., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 28/38] gnu: avahi: Make the 'patch-more-shebangs' phase unconditional.,
Maxime Devos <=
- [bug#50905] [PATCH 32/38] gnu: json-glib: Make 'bash-minimal' input unconditional., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 35/38] gnu: libcap: Unconditionally use #$output., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 13/38] gnu: gobject-introspection: Use python instead of python-wrapper., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 38/38] lint: check-wrapper-inputs: Remove mentions of core-updates., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 23/38] gnu: at-spi2-core: Make 'bash-minimal' input unconditional., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 12/38] gnu: gobject-introspection: Move things to native-inputs., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 30/38] gnu: wayland: Unconditionally lookup docbook in native-inputs., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 33/38] gnu: heimdal: Make some parts of phases unconditional., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 29/38] gnu: freedesktop: Unconditionally use alternatives to % variables., Maxime Devos, 2021/09/29