Author: ludo
Date: Thu Oct  7 20:07:59 2010
New Revision: 24149
URL: https://svn.nixos.org/websvn/nix/?rev=24149&sc=1

Log:
nss-mdns: Fix the path to the `avahi-daemon' socket.

Modified:
   nixpkgs/trunk/pkgs/tools/networking/nss-mdns/default.nix

Modified: nixpkgs/trunk/pkgs/tools/networking/nss-mdns/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/networking/nss-mdns/default.nix    Thu Oct  7 
16:58:07 2010        (r24148)
+++ nixpkgs/trunk/pkgs/tools/networking/nss-mdns/default.nix    Thu Oct  7 
20:07:59 2010        (r24149)
@@ -1,25 +1,24 @@
-{ fetchurl, stdenv, avahi }:
+{ fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
   name = "nss-mdns-0.10";
+
   src = fetchurl {
     url = "http://0pointer.de/lennart/projects/nss-mdns/${name}.tar.gz";;
     sha256 = "0vgs6j0qsl0mwzh5a0m0bykr7x6bx79vnbyn0r3q289rghp3qs0y";
   };
 
-  configureFlags = "--enable-avahi";
-
   # Note: Although `nss-mdns' works by talking to `avahi-daemon', it
   # doesn't depend on the Avahi libraries.  Instead, it contains
   # hand-written D-Bus code to talk to the Avahi daemon.
 
-  buildInput = [ avahi ];
-
-  patchPhase = ''
-    substituteInPlace "src/Makefile.in"                                        
        \
-      --replace 'AVAHI_SOCKET=\"$(localstatedir)/run/avahi-daemon/socket\"'    
\
-                'AVAHI_SOCKET=\"${avahi}/var/run/avahi-daemon/socket\"'
-  '';
+  configureFlags =
+    [ # Try to use the Avahi daemon before resolving on our own.
+      "--enable-avahi"
+
+      # Connect to the daemon at `/var/run/avahi-daemon/socket'.
+      "--localstatedir=/var"
+    ];
 
   meta = {
     description = "The mDNS Name Service Switch (NSS) plug-in";
@@ -33,5 +32,10 @@
 
     homepage = http://0pointer.de/lennart/projects/nss-mdns/;
     license = "LGPLv2+";
+
+    # Supports both the GNU and FreeBSD NSS.
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.freebsd;
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
   };
 }
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to