mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-19 05:57:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: avahi: Make all arguments unconditional.

Browse source 
* gnu/packages/avahi.scm (avahi)[origin]: Fix indentation
and remove trailing #t.
[arguments]: Re-integrate conditional arguments.
This commit is contained in:
Maxim Cournoyer 2021-12-17 15:07:20 -05:00
parent 80d8cf6cc6
commit 756188a8da
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 28 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
gnu/packages/avahi.scm
View file

@ -43,22 +43,21 @@ (define-public avahi
(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 @@ (define-public avahi
,@(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)