Building mumble a bit further.

svn path=/nixpkgs/trunk/; revision=25908

pkgs/applications/networking/mumble/default.nix

@@ -1,7 +1,7 @@
 { stdenv, fetchurl, qt4, libvorbis, boost, speechd, protobuf, libsndfile,
  avahi }:
         
-throw "It does not build still. It wants dns_sd.h"
+throw "It does not build still. It wants a g15daemon header file or so"
 
 stdenv.mkDerivation rec {
   name = "mumble-" + version;

pkgs/development/libraries/avahi/default.nix

@@ -1,6 +1,7 @@
 { fetchurl, stdenv, pkgconfig, libdaemon, dbus, perl, perlXMLParser
 , expat, gettext, intltool, glib, gtk, qt4 ? null, lib
-, qt4Support ? false }:
+, qt4Support ? false
+, withLibdnsCompat ? false }:
 
 assert qt4Support -> qt4 != null;
 
@@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
       "--${if qt4Support then "enable" else "disable"}-qt4"
       "--disable-python"
       "--with-distro=none" "--localstatedir=/var"
-    ];
+    ] ++ stdenv.lib.optional withLibdnsCompat "--enable-compat-libdns_sd";
 
   meta = {
     description = "Avahi, an mDNS/DNS-SD implementation";

pkgs/top-level/all-packages.nix

@@ -6369,8 +6369,7 @@ let
 
   mumble = callPackage ../applications/networking/mumble {
     avahi = avahi.override {
-      qt4Support = true;
-      inherit qt4;
+      withLibdnsCompat = true;
     };
   };