diff options
author | Ludovic Courtès <ludo@gnu.org> | 2008-02-06 19:36:12 +0000 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2008-02-06 19:36:12 +0000 |
commit | b60e822bfb4b23e161df958104cfd77db34b7734 (patch) | |
tree | 483c2a76ebc8a07a330789ffb597609c5f78d47c | |
parent | 10daeadd7df6b3a41c59b1981add7c3b213de8dc (diff) | |
download | nixlib-b60e822bfb4b23e161df958104cfd77db34b7734.tar nixlib-b60e822bfb4b23e161df958104cfd77db34b7734.tar.gz nixlib-b60e822bfb4b23e161df958104cfd77db34b7734.tar.bz2 nixlib-b60e822bfb4b23e161df958104cfd77db34b7734.tar.lz nixlib-b60e822bfb4b23e161df958104cfd77db34b7734.tar.xz nixlib-b60e822bfb4b23e161df958104cfd77db34b7734.tar.zst nixlib-b60e822bfb4b23e161df958104cfd77db34b7734.zip |
Add `avahi' package.
svn path=/nixpkgs/trunk/; revision=10527
-rw-r--r-- | pkgs/development/libraries/avahi/default.nix | 12 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index 52051725e228..c8a94c0dbb15 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -1,14 +1,14 @@ -{stdenv, fetchurl, pkgconfig}: +{stdenv, fetchurl, pkgconfig, libdaemon, dbus}: stdenv.mkDerivation { - name = "avahi-0.6.11"; + name = "avahi-0.6.21"; src = fetchurl { - url = http://avahi.org/download/avahi-0.6.11.tar.gz; - md5 = "91fd8cc0c2bae638848faad36cf1c032"; + url = http://avahi.org/download/avahi-0.6.21.tar.gz; + sha256 = "d817c35f43011861476eab02eea14edd123b2bc58b4408d9d9b69b0c39252561"; }; #buildInputs = [pkgconfig glib gtk libpng libglade]; - buildInputs = [pkgconfig]; + buildInputs = [pkgconfig libdaemon dbus]; - configureFlags = "--disable-glib --disable-qt3 --disable-qt4 --disable-gtk --disable-dbus --disable-expat --disable-gdbm --disable-libdaemon --disable-python --disable-mono"; + configureFlags = "--disable-glib --disable-qt3 --disable-qt4 --disable-gtk --disable-expat --disable-gdbm --disable-python --disable-mono --with-distro=none CPPFLAGS=-Ddbus_watch_get_unix_fd=dbus_watch_get_fd"; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a3049b6efc92..5ac2e3c582c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -326,6 +326,10 @@ rec { inherit fetchurl stdenv zlib wxGTK; }; + avahi = import ../development/libraries/avahi { + inherit stdenv fetchurl pkgconfig libdaemon dbus; + }; + axel = import ../tools/networking/axel { inherit fetchurl stdenv; }; |