diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-03-04 13:04:08 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-03-04 13:04:08 +0000 |
| commit | 3a4b95e503a45ae68be7850d6095ef7e175d6e53 (patch) | |
| tree | 8ba4a140071622357152ac431d69d0236fa739f0 /pkgs | |
| parent | 69b8bc9ed7e817862ed68b5faa0f971449e3809e (diff) | |
| download | nixlib-3a4b95e503a45ae68be7850d6095ef7e175d6e53.tar nixlib-3a4b95e503a45ae68be7850d6095ef7e175d6e53.tar.gz nixlib-3a4b95e503a45ae68be7850d6095ef7e175d6e53.tar.bz2 nixlib-3a4b95e503a45ae68be7850d6095ef7e175d6e53.tar.lz nixlib-3a4b95e503a45ae68be7850d6095ef7e175d6e53.tar.xz nixlib-3a4b95e503a45ae68be7850d6095ef7e175d6e53.tar.zst nixlib-3a4b95e503a45ae68be7850d6095ef7e175d6e53.zip | |
* Simplify the avahi call.
svn path=/nixpkgs/branches/x-updates/; revision=26158
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 13 |
1 files 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 { }; |