alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Avahi: Make Qt4 support optional and configurable.

Browse source 
svn path=/nixpkgs/trunk/; revision=10997
This commit is contained in:
Ludovic Courtès 2008-03-06 16:42:34 +00:00
parent 2d948fed46
commit d1ed48981c
2 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkgs/development/libraries/avahi/common.nix
View file

@ -1,5 +1,7 @@
sha256: args: with args; sha256: args: with args;
assert qt4Support -> qt4 != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "avahi-" + version; name = "avahi-" + version;
src = fetchurl { src = fetchurl {
@ -7,12 +9,21 @@ stdenv.mkDerivation rec {
inherit sha256; inherit sha256;
}; };
buildInputs = [pkgconfig libdaemon dbus perl perlXMLParser glib qt4]; buildInputs = [pkgconfig libdaemon dbus perl perlXMLParser glib expat]
++ lib.optional qt4Support qt4;
configureFlags = "--disable-qt3 --disable-gdbm --disable-gtk --disable-mono configureFlags = ''
--with-distro=none --enable-shared --disable-static --disable-python"; --disable-qt3 --disable-gdbm --disable-gtk --disable-mono
--${if qt4Support then "enable" else "disable"}-qt4
--with-distro=none --enable-shared --disable-static --disable-python
'';
meta = { meta = {
description = ''Avahi is a system which facilitates service discovery
on a local network. It is an implementation of the
mDNS (for "Multicast DNS") and DNS-SD (for "DNS-Based
Service Discovery") protocols.'';
homepage = http://avahi.org; homepage = http://avahi.org;
license = "LGPLv2+";
}; };
} }

18
pkgs/top-level/all-packages.nix
View file

@ -386,11 +386,19 @@ rec {
inherit fetchurl stdenv zlib wxGTK; inherit fetchurl stdenv zlib wxGTK;
}; };
avahi = selectVersion ../development/libraries/avahi "0.6.22" { avahi =
inherit stdenv fetchurl pkgconfig libdaemon dbus perl perlXMLParser qt4 # XXX: Versions prior to 0.6.22 did not support Qt4, so enabling
python expat; # Qt4 should not be permitted when using a version of Avahi older
inherit (gtkLibs) glib gtk; # than 0.6.22, hence the default to `false'.
}; let qt4Support = getConfig [ "avahi" "qt4Support" ] false;
in
selectVersion ../development/libraries/avahi "0.6.22" {
inherit stdenv fetchurl pkgconfig libdaemon dbus perl perlXMLParser
expat lib;
inherit (gtkLibs) glib gtk;
inherit qt4Support;
qt4 = if qt4Support then qt4 else null;
};
axel = import ../tools/networking/axel { axel = import ../tools/networking/axel {
inherit fetchurl stdenv; inherit fetchurl stdenv;