diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2010-07-13 16:32:22 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2010-07-13 16:32:22 +0000 |
| commit | f0ef9cdb407c45c198b0f9184c646b69029c4e2a (patch) | |
| tree | 6d81631ed94ec6db1d77e3c5398003189e10010b /pkgs/development/libraries/avahi | |
| parent | a8d7566f1a379679a92a5f8ea63a0c2a0273a5a7 (diff) | |
Avahi 0.6.27.
svn path=/nixpkgs/trunk/; revision=22582
Diffstat (limited to 'pkgs/development/libraries/avahi')
| -rw-r--r-- | pkgs/development/libraries/avahi/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch | 14 |
2 files changed, 12 insertions, 12 deletions
diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index 410a07761ee5a..b4424b445c5fa 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -5,10 +5,10 @@ assert qt4Support -> qt4 != null; stdenv.mkDerivation rec { - name = "avahi-0.6.25"; + name = "avahi-0.6.27"; src = fetchurl { url = "${meta.homepage}/download/${name}.tar.gz"; - sha256 = "0ndsrd357igp0m2cd8vwr16gmh6axlndf34hlg7qqnsiymsdj84j"; + sha256 = "112yqh5k4ph5f1fsd98q1035477wmzq5nm2jrkivz5fnn3hgabf2"; }; patches = [ ./no-mkdir-localstatedir.patch ]; @@ -20,8 +20,10 @@ stdenv.mkDerivation rec { ++ (lib.optional qt4Support qt4); configureFlags = - [ "--disable-qt3" "--disable-gdbm" "--disable-gtk" "--disable-mono" - "--${if qt4Support then "enable" else "disable"}-qt4" "--disable-python" + [ "--disable-qt3" "--disable-gdbm" "--disable-mono" + "--disable-gtk" "--disable-gtk3" + "--${if qt4Support then "enable" else "disable"}-qt4" + "--disable-python" "--with-distro=none" "--localstatedir=/var" ]; diff --git a/pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch b/pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch index 29e5a05e09d15..76377d105707f 100644 --- a/pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch +++ b/pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch @@ -1,14 +1,12 @@ Don't "mkdir $(localstatedir)" since we can't do it (/var). ---- avahi-0.6.25/avahi-daemon/Makefile.in 2009-04-14 03:57:14.000000000 +0200 -+++ avahi-0.6.25/avahi-daemon/Makefile.in 2010-05-09 00:12:35.000000000 +0200 -@@ -1310,7 +1310,7 @@ xmllint: +--- avahi-0.6.27/avahi-daemon/Makefile.in 2010-07-13 05:06:35.000000000 +0200 ++++ avahi-0.6.27/avahi-daemon/Makefile.in 2010-07-13 18:03:45.000000000 +0200 +@@ -1554,7 +1554,6 @@ xmllint: done install-data-local: - test -z "$(localstatedir)/run" || $(mkdir_p) "$(DESTDIR)$(localstatedir)/run" -+ - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: - + + update-systemd: + curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c > sd-daemon.c |