Author: eelco
Date: Fri Mar 4 13:04:08 2011
New Revision: 26158
URL: https://svn.nixos.org/websvn/nix/?rev=26158&sc=1
Log:
* Simplify the avahi call.
Modified:
nixpkgs/branches/x-updates/pkgs/top-level/all-packages.nix
Modified: nixpkgs/branches/x-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/x-updates/pkgs/top-level/all-packages.nix Fri Mar 4
12:03:53 2011 (r26157)
+++ nixpkgs/branches/x-updates/pkgs/top-level/all-packages.nix Fri Mar 4
13:04:08 2011 (r26158)
@@ -394,16 +394,9 @@
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 { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
