summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2011-09-18 13:54:54 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2011-09-18 13:54:54 +0000
commit595d141a3097eb5dcacecdcd797e6b2a7eb896e8 (patch)
tree0e01352686efd8c8b39df54c203f3a238318dade /pkgs
parent7b8f4ec5403112e18fec607467c4c2ac57812e27 (diff)
downloadnixpkgs-595d141a3097eb5dcacecdcd797e6b2a7eb896e8.tar
nixpkgs-595d141a3097eb5dcacecdcd797e6b2a7eb896e8.tar.gz
nixpkgs-595d141a3097eb5dcacecdcd797e6b2a7eb896e8.tar.bz2
nixpkgs-595d141a3097eb5dcacecdcd797e6b2a7eb896e8.tar.lz
nixpkgs-595d141a3097eb5dcacecdcd797e6b2a7eb896e8.tar.xz
nixpkgs-595d141a3097eb5dcacecdcd797e6b2a7eb896e8.tar.zst
nixpkgs-595d141a3097eb5dcacecdcd797e6b2a7eb896e8.zip
avahi-0.6.30
svn path=/nixpkgs/trunk/; revision=29332
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/avahi/default.nix17
1 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix
index 709ea3583dc..7730e403d58 100644
--- a/pkgs/development/libraries/avahi/default.nix
+++ b/pkgs/development/libraries/avahi/default.nix
@@ -1,33 +1,32 @@
 { fetchurl, stdenv, pkgconfig, libdaemon, dbus, perl, perlXMLParser
-, expat, gettext, intltool, glib, gtk, qt4 ? null, lib
+, expat, gettext, intltool, glib, qt4 ? null, lib
 , qt4Support ? false
-, withLibdnsCompat ? false }:
+, withLibdnssdCompat ? false }:
 
 assert qt4Support -> qt4 != null;
 
 stdenv.mkDerivation rec {
-  name = "avahi-0.6.28";
+  name = "avahi-0.6.30";
 
   src = fetchurl {
     url = "${meta.homepage}/download/${name}.tar.gz";
-    sha256 = "14gw611d3srn2r18a6g4y04r571w3l4lihiiaffryar1i2n0mn50";
+    sha256 = "07zzaxs81rbrfhj0rnq616c3j37f3g84dn7d4q3h5l1r4dn33r7r";
   };
 
   patches = [ ./no-mkdir-localstatedir.patch ];
 
-  buildInputs = [
-      pkgconfig libdaemon dbus perl perlXMLParser glib expat
-      gettext intltool
-    ]
+  buildInputs = [ libdaemon dbus perl perlXMLParser glib expat ]
     ++ (lib.optional qt4Support qt4);
 
+  buildNativeInputs = [ pkgconfig gettext intltool ];
+
   configureFlags =
     [ "--disable-qt3" "--disable-gdbm" "--disable-mono"
       "--disable-gtk" "--disable-gtk3"
       "--${if qt4Support then "enable" else "disable"}-qt4"
       "--disable-python"
       "--with-distro=none" "--localstatedir=/var"
-    ] ++ stdenv.lib.optional withLibdnsCompat "--enable-compat-libdns_sd";
+    ] ++ stdenv.lib.optional withLibdnssdCompat "--enable-compat-libdns_sd";
 
   meta = {
     description = "Avahi, an mDNS/DNS-SD implementation";