summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-03-17 23:20:15 +0100
committerLudovic Courtès <ludo@gnu.org>2018-03-18 00:02:06 +0100
commitb34ac8248205d64b4023412e61512dfefe44cb9e (patch)
treedb06c720c1c74a4ad80b7fad791d2295e4109dde
parent80f565d3137eceb479b8f7d39c26e00385dd65f6 (diff)
downloadguix-b34ac8248205d64b4023412e61512dfefe44cb9e.tar.gz
gnu: nss-mdns: Adjust Avahi socket file name.
Fixes <https://bugs.gnu.org/30613>.
Regression introduced in 550f4509acf2c0f67882260414b0bb2843e07465.
Reported by George myglc2 Clemmer <myglc2@gmail.com>.

* gnu/packages/avahi.scm (nss-mdns)[arguments]: Remove
 #:configure-flags.  Add #:phases.
-rw-r--r--gnu/packages/avahi.scm16
1 files changed, 12 insertions, 4 deletions
diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm
index 480b5e8d97..7734028dc3 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