Author: ludo
Date: Tue Jul 13 16:32:22 2010
New Revision: 22582
URL: https://svn.nixos.org/websvn/nix/?rev=22582&sc=1
Log:
Avahi 0.6.27.
Modified:
nixpkgs/trunk/pkgs/development/libraries/avahi/default.nix
nixpkgs/trunk/pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch
Modified: nixpkgs/trunk/pkgs/development/libraries/avahi/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/avahi/default.nix Tue Jul 13
16:32:19 2010 (r22581)
+++ nixpkgs/trunk/pkgs/development/libraries/avahi/default.nix Tue Jul 13
16:32:22 2010 (r22582)
@@ -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 @@
++ (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"
];
Modified:
nixpkgs/trunk/pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch
Tue Jul 13 16:32:19 2010 (r22581)
+++ nixpkgs/trunk/pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch
Tue Jul 13 16:32:22 2010 (r22582)
@@ -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
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
