Avahi: Use /var as localstatedir.

Reported by Lluís Batlle.

svn path=/nixpkgs/trunk/; revision=21672
This commit is contained in:
Ludovic Courtès 2010-05-08 22:24:39 +00:00
parent 8d9af6d596
commit cfd8533c8d
2 changed files with 24 additions and 5 deletions

View File

@ -11,17 +11,19 @@ stdenv.mkDerivation rec {
sha256 = "0ndsrd357igp0m2cd8vwr16gmh6axlndf34hlg7qqnsiymsdj84j";
};
patches = [ ./no-mkdir-localstatedir.patch ];
buildInputs = [
pkgconfig libdaemon dbus perl perlXMLParser glib expat
gettext intltool
]
++ lib.optional qt4Support qt4;
configureFlags = ''
--disable-qt3 --disable-gdbm --disable-gtk --disable-mono
--${if qt4Support then "enable" else "disable"}-qt4
--with-distro=none --disable-python
'';
configureFlags =
[ "--disable-qt3" "--disable-gdbm" "--disable-gtk" "--disable-mono"
"--${if qt4Support then "enable" else "disable"}-qt4" "--disable-python"
"--with-distro=none" "--localstatedir=/var"
];
meta = {
description = "Avahi, an mDNS/DNS-SD implementation";
@ -34,5 +36,8 @@ stdenv.mkDerivation rec {
homepage = http://avahi.org;
license = "LGPLv2+";
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
maintainers = [ stdenv.lib.maintainers.ludo ];
};
}

View File

@ -0,0 +1,14 @@
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:
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: