guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

07/09: gnu: nss-mdns: Adjust Avahi socket file name.


From: Ludovic Courtès
Subject: 07/09: gnu: nss-mdns: Adjust Avahi socket file name.
Date: Sat, 17 Mar 2018 19:02:38 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit b34ac8248205d64b4023412e61512dfefe44cb9e
Author: Ludovic Courtès <address@hidden>
Date:   Sat Mar 17 23:20:15 2018 +0100

    gnu: nss-mdns: Adjust Avahi socket file name.
    
    Fixes <https://bugs.gnu.org/30613>.
    Regression introduced in 550f4509acf2c0f67882260414b0bb2843e07465.
    Reported by George myglc2 Clemmer <address@hidden>.
    
    * gnu/packages/avahi.scm (nss-mdns)[arguments]: Remove
     #:configure-flags.  Add #:phases.
---
 gnu/packages/avahi.scm | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm
index 480b5e8..7734028 100644
--- a/gnu/packages/avahi.scm
+++ b/gnu/packages/avahi.scm
@@ -99,10 +99,18 @@ DNS-SD (for \"DNS-Based Service Discovery\") protocols.")
                        (method url-fetch))))))
     (build-system gnu-build-system)
     (arguments
-     ;; The Avahi daemon socket is expected by src/Makefile.am to be at
-     ;; "$(localstatedir)/run/avahi-daemon/socket", so set $(localstatedir)
-     ;; appropriately.
-     '(#:configure-flags '("--localstatedir=/var")))
+     '(#: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)))))
     (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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]