From 3a4b95e503a45ae68be7850d6095ef7e175d6e53 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Fri, 4 Mar 2011 13:04:08 +0000 Subject: [PATCH] * Simplify the avahi call. svn path=/nixpkgs/branches/x-updates/; revision=26158 --- pkgs/top-level/all-packages.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f10efcc6db46..803f1b1f15b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -394,16 +394,9 @@ let autojump = callPackage ../tools/misc/autojump { }; - avahi = - let qt4Support = getConfig [ "avahi" "qt4Support" ] false; - in - makeOverridable (import ../development/libraries/avahi) { - inherit stdenv fetchurl pkgconfig libdaemon dbus perl perlXMLParser - expat gettext intltool lib; - inherit (gtkLibs) glib gtk; - inherit qt4Support; - qt4 = if qt4Support then qt4 else null; - }; + avahi = callPackage ../development/libraries/avahi { + qt4Support = getConfig [ "avahi" "qt4Support" ] false; + }; axel = callPackage ../tools/networking/axel { };