avahi: glib and qt4 support, 0.6.22 added

svn path=/nixpkgs/branches/stdenv-updates/; revision=10737

pkgs/development/libraries/avahi/0.6.21.nix

@@ -0,0 +1,2 @@
+args:
+import ./common.nix "0q954lwhr6xnv7chhi4bqlmkn4nx9shyw0mbdr3n26018dgw65yq" args

pkgs/development/libraries/avahi/0.6.22.nix

@@ -0,0 +1,2 @@
+args:
+import ./common.nix "0lnxzsdhihb3kjwd3vcrl9pq6ykfbp0vy9ja0mch01ffnrqgiilx" args

pkgs/development/libraries/avahi/common.nix

@@ -0,0 +1,18 @@
+sha256: args: with args;
+
+stdenv.mkDerivation rec {
+  name = "avahi-" + version;
+  src = fetchurl {
+    url = "${meta.homepage}/download/${name}.tar.gz";
+    inherit sha256;
+  };
+
+  buildInputs = [pkgconfig libdaemon dbus perl perlXMLParser glib qt4];
+
+  configureFlags = "--disable-qt3 --disable-gdbm --disable-gtk --disable-mono
+    --with-distro=none --enable-shared --disable-static --disable-python";
+
+  meta = {
+    homepage = http://avahi.org;
+  };
+}

pkgs/development/libraries/avahi/default.nix

@@ -1,14 +0,0 @@
-{stdenv, fetchurl, pkgconfig, libdaemon, dbus}:
-
-stdenv.mkDerivation {
-  name = "avahi-0.6.21";
-  src = fetchurl {
-    url = http://avahi.org/download/avahi-0.6.21.tar.gz;
-    sha256 = "d817c35f43011861476eab02eea14edd123b2bc58b4408d9d9b69b0c39252561";
-  };
-
-  #buildInputs = [pkgconfig glib gtk libpng libglade];
-  buildInputs = [pkgconfig libdaemon dbus];
-
-  configureFlags = "--disable-glib --disable-qt3 --disable-qt4 --disable-gtk --disable-expat --disable-gdbm --disable-python --disable-mono --with-distro=none CPPFLAGS=-Ddbus_watch_get_unix_fd=dbus_watch_get_fd";
-}

pkgs/top-level/all-packages.nix

@@ -334,8 +334,10 @@ rec {
     inherit fetchurl stdenv zlib wxGTK;
   };
 
-  avahi = import ../development/libraries/avahi {
+  avahi = selectVersion ../development/libraries/avahi "0.6.22" {
-    inherit stdenv fetchurl pkgconfig libdaemon dbus;
+    inherit stdenv fetchurl pkgconfig libdaemon dbus perl perlXMLParser qt4
+      python expat;
+    inherit (gtkLibs) glib gtk;
   };
 
   axel = import ../tools/networking/axel {