diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2010-05-08 22:24:39 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2010-05-08 22:24:39 +0000 |
| commit | cfd8533c8d942b5b0f54809216e0b61b671cf56e (patch) | |
| tree | 70e110e7e0df064f77d9b75cac03a8d1cf9d3e6e /pkgs/development/libraries/avahi | |
| parent | 8d9af6d5969e1831ae50603a0f31cacad614c47a (diff) | |
Avahi: Use /var as localstatedir.
Reported by Lluís Batlle.
svn path=/nixpkgs/trunk/; revision=21672
Diffstat (limited to 'pkgs/development/libraries/avahi')
| -rw-r--r-- | pkgs/development/libraries/avahi/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch | 14 |
2 files changed, 24 insertions, 5 deletions
diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index ad7ba37568bd..f481c8d65e3b 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -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 ]; }; } diff --git a/pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch b/pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch new file mode 100644 index 000000000000..29e5a05e09d1 --- /dev/null +++ b/pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch @@ -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: + |