diff options
author | Marius Bakke <mbakke@fastmail.com> | 2018-06-11 23:52:15 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2018-06-11 23:52:15 +0200 |
commit | a032b4454b3fc67e11e9fc2d8c2345288065fa29 (patch) | |
tree | c208124b79dbd2224b68c52106aa72ff2ebfa7ab /gnu/packages/avahi.scm | |
parent | b5724230fed2d043206df20d12a45bb962b7ee77 (diff) | |
parent | 6321ce42ab4d9ab788d858cb19bde4aa7a0e3ecc (diff) | |
download | patches-a032b4454b3fc67e11e9fc2d8c2345288065fa29.tar patches-a032b4454b3fc67e11e9fc2d8c2345288065fa29.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/avahi.scm')
-rw-r--r-- | gnu/packages/avahi.scm | 31 |
1 files changed, 6 insertions, 25 deletions
diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm index 7734028dc3..df74437631 100644 --- a/gnu/packages/avahi.scm +++ b/gnu/packages/avahi.scm @@ -77,7 +77,7 @@ DNS-SD (for \"DNS-Based Service Discovery\") protocols.") (define-public nss-mdns (package (name "nss-mdns") - (version "0.12") + (version "0.14.1") (home-page "https://github.com/lathiat/nss-mdns") (source (origin (method url-fetch) @@ -85,32 +85,13 @@ DNS-SD (for \"DNS-Based Service Discovery\") protocols.") name "-" version ".tar.gz")) (sha256 (base32 - "1p2vj9fz4kzrjrj81ipf4qwgnr2n7a8cbzw4bpk18xyqhdx8h775")) - (patches - (list (origin - ;; See - ;; <https://github.com/lathiat/nss-mdns/issues/26#issuecomment-364781799>. - (uri (string-append - home-page - "/commit/31ccbec3b4f054e590c7c880d8a8a50cfc97127d.patch")) - (sha256 - (base32 - "0b1jmhnkpsczbph4ala7x3rafwxdg93277s30iaxh37jnvgjnhsd")) - (method url-fetch)))))) + "134wdr0n9cm5ab4g6dwq76lvzqns9dcylr470i2xxjimnw0l22d2")))) (build-system gnu-build-system) (arguments - '(#:phases (modify-phases %standard-phases - (add-after 'unpack 'set-avahi-socket-name - (lambda _ - ;; The Avahi daemon socket is expected by - ;; src/Makefile.am to be at - ;; "$(localstatedir)/run/avahi-daemon/socket", but - ;; nowadays it lives in /run/avahi-daemon/socket. - ;; Remove the "$(localstatedir)" bit. - (substitute* "src/Makefile.in" - (("\\$\\(localstatedir)/run/avahi-daemon/socket") - "/run/avahi-daemon/socket")) - #t))))) + ;; The Avahi daemon socket is expected by 'configure.ac' to be at + ;; "$(localstatedir)/run/avahi-daemon/socket", but nowadays it lives in + ;; /run/avahi-daemon/socket. Remove the "$(localstatedir)" bit. + '(#:configure-flags '("AVAHI_SOCKET=/run/avahi-daemon/socket"))) (synopsis "Multicast DNS Name Service Switch (@dfn{NSS}) plug-in") (description "Nss-mdns is a plug-in for the GNU C Library's Name Service Switch |