diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-12-17 15:07:20 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-10 11:44:30 -0500 |
| commit | 756188a8da7e3cf4a784dab4eab05799eb2f2dd5 (patch) | |
| tree | dd8d9a925d9e9dd7ca2cf8270123e58d6a43d83c /gnu/packages | |
| parent | 80d8cf6cc62e7fd058480ef3ffa1b015e007036b (diff) | |
| download | guix-756188a8da7e3cf4a784dab4eab05799eb2f2dd5.tar.gz guix-756188a8da7e3cf4a784dab4eab05799eb2f2dd5.zip | |
gnu: avahi: Make all arguments unconditional.
* gnu/packages/avahi.scm (avahi)[origin]: Fix indentation
and remove trailing #t.
[arguments]: Re-integrate conditional arguments.
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/avahi.scm | 63 |
1 files changed, 28 insertions, 35 deletions
diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm index 7dcaa17a76..65d3ede131 100644 --- a/gnu/packages/avahi.scm +++ b/gnu/packages/avahi.scm @@ -43,22 +43,21 @@ (version "0.8") (home-page "https://avahi.org") (source (origin - (method url-fetch) - (uri (string-append home-page "/download/avahi-" - version ".tar.gz")) - (sha256 - (base32 - "1npdixwxxn3s9q1f365x9n9rc5xgfz39hxf23faqvlrklgbhj0q6")) - (patches (search-patches "avahi-localstatedir.patch")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Fix version constraint in the avahi-libevent pkg-config file. - ;; This can be removed for Avahi versions > 0.8. - (substitute* "avahi-libevent.pc.in" - (("libevent-2\\.1\\.5") - "libevent >= 2.1.5")) - #t)))) + (method url-fetch) + (uri (string-append home-page "/download/avahi-" + version ".tar.gz")) + (sha256 + (base32 + "1npdixwxxn3s9q1f365x9n9rc5xgfz39hxf23faqvlrklgbhj0q6")) + (patches (search-patches "avahi-localstatedir.patch")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Fix version constraint in the avahi-libevent pkg-config file. + ;; This can be removed for Avahi versions > 0.8. + (substitute* "avahi-libevent.pc.in" + (("libevent-2\\.1\\.5") + "libevent >= 2.1.5")))))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-distro=none" @@ -75,26 +74,20 @@ ,@(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 - ;; TODO(core-updates): Make this input unconditional. - `(,@(if (%current-target-system) - `(("bash-minimal" ,bash-minimal)) - '()) + `(("bash-minimal" ,bash-minimal) ("dbus" ,dbus) ("expat" ,expat) ("gdbm" ,gdbm) |