diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2008-12-12 23:02:11 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2008-12-12 23:02:11 +0000 |
| commit | b2f24eb5fa50dfba844cea9d12f938feb48d24c0 (patch) | |
| tree | e8cc2d2efe75e35fff52f7c4b64a573df5b89c5a /pkgs/development/libraries/avahi | |
| parent | 9ed6e06b38f36939a2b8b1202f418d0e46446510 (diff) | |
| download | nixpkgs-b2f24eb5fa50dfba844cea9d12f938feb48d24c0.tar nixpkgs-b2f24eb5fa50dfba844cea9d12f938feb48d24c0.tar.gz nixpkgs-b2f24eb5fa50dfba844cea9d12f938feb48d24c0.tar.bz2 nixpkgs-b2f24eb5fa50dfba844cea9d12f938feb48d24c0.tar.lz nixpkgs-b2f24eb5fa50dfba844cea9d12f938feb48d24c0.tar.xz nixpkgs-b2f24eb5fa50dfba844cea9d12f938feb48d24c0.tar.zst nixpkgs-b2f24eb5fa50dfba844cea9d12f938feb48d24c0.zip | |
Avahi 0.6.24.
svn path=/nixpkgs/trunk/; revision=13626
Diffstat (limited to 'pkgs/development/libraries/avahi')
| -rw-r--r-- | pkgs/development/libraries/avahi/0.6.21.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/avahi/0.6.22.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/avahi/default.nix (renamed from pkgs/development/libraries/avahi/common.nix) | 13 |
3 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/development/libraries/avahi/0.6.21.nix b/pkgs/development/libraries/avahi/0.6.21.nix deleted file mode 100644 index 26f03ca58bf..00000000000 --- a/pkgs/development/libraries/avahi/0.6.21.nix +++ /dev/null @@ -1,2 +0,0 @@ -args: -import ./common.nix "0q954lwhr6xnv7chhi4bqlmkn4nx9shyw0mbdr3n26018dgw65yq" args diff --git a/pkgs/development/libraries/avahi/0.6.22.nix b/pkgs/development/libraries/avahi/0.6.22.nix deleted file mode 100644 index 93b7184cdae..00000000000 --- a/pkgs/development/libraries/avahi/0.6.22.nix +++ /dev/null @@ -1,2 +0,0 @@ -args: -import ./common.nix "0lnxzsdhihb3kjwd3vcrl9pq6ykfbp0vy9ja0mch01ffnrqgiilx" args diff --git a/pkgs/development/libraries/avahi/common.nix b/pkgs/development/libraries/avahi/default.nix index a44c2863cc9..0db32ec6858 100644 --- a/pkgs/development/libraries/avahi/common.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -1,15 +1,20 @@ -sha256: args: with args; +{ fetchurl, stdenv, pkgconfig, libdaemon, dbus, perl, perlXMLParser +, expat, gettext, intltool, glib, gtk, qt4 ? null, lib +, qt4Support ? false }: assert qt4Support -> qt4 != null; stdenv.mkDerivation rec { - name = "avahi-" + version; + name = "avahi-0.6.24"; src = fetchurl { url = "${meta.homepage}/download/${name}.tar.gz"; - inherit sha256; + sha256 = "0l5rsi4s7az7cs9p4aqs77v7jrh95iiwwx0ivksmivc8c7a70016"; }; - buildInputs = [pkgconfig libdaemon dbus perl perlXMLParser glib expat] + buildInputs = [ + pkgconfig libdaemon dbus perl perlXMLParser glib expat + gettext intltool + ] ++ lib.optional qt4Support qt4; configureFlags = '' |