diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-23 16:04:53 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-23 16:04:53 +0200 |
| commit | 96cec2a7bdf2482ae58fe04cce5e87a1eec644f9 (patch) | |
| tree | ea48b901c9ba0ac2b4a249ae94bd966c4a025001 /pkgs/development/libraries/avahi/default.nix | |
| parent | db83d9a35b09a7cc548d9b8b2ad63c1f8ca8ba28 (diff) | |
| parent | 084626deecaffcaa017af07eaab00682eff5d6f3 (diff) | |
| download | nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar.gz nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar.bz2 nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar.lz nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar.xz nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar.zst nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.zip | |
Merge 'staging' into multiple-outputs
Conflicts: pkgs/applications/audio/flac/default.nix pkgs/build-support/gcc-wrapper/builder.sh pkgs/development/libraries/apr-util/default.nix pkgs/development/libraries/apr/default.nix pkgs/development/libraries/atk/default.nix pkgs/development/libraries/freetype/default.nix pkgs/development/libraries/gdk-pixbuf/default.nix pkgs/development/libraries/glib/default.nix pkgs/development/libraries/glibc/2.17/builder.sh pkgs/development/libraries/glibc/2.17/locales.nix pkgs/development/libraries/libjpeg/default.nix pkgs/development/libraries/libogg/default.nix pkgs/development/libraries/libsamplerate/default.nix pkgs/development/libraries/libtiff/default.nix pkgs/development/libraries/libvorbis/default.nix pkgs/development/libraries/mesa/default.nix pkgs/development/libraries/pango/default.nix pkgs/development/web/nodejs/default.nix pkgs/os-specific/linux/pam/default.nix pkgs/os-specific/linux/systemd/default.nix pkgs/stdenv/generic/setup.sh pkgs/stdenv/linux/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/release-small.nix
Diffstat (limited to 'pkgs/development/libraries/avahi/default.nix')
| -rw-r--r-- | pkgs/development/libraries/avahi/default.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index f4795286e096..0adc7d56357e 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -7,11 +7,11 @@ assert qt4Support -> qt4 != null; stdenv.mkDerivation rec { - name = "avahi-0.6.30"; + name = "avahi-0.6.31"; src = fetchurl { url = "${meta.homepage}/download/${name}.tar.gz"; - sha256 = "07zzaxs81rbrfhj0rnq616c3j37f3g84dn7d4q3h5l1r4dn33r7r"; + sha256 = "0j5b5ld6bjyh3qhd2nw0jb84znq0wqai7fsrdzg7bpg24jdp2wl3"; }; patches = [ ./no-mkdir-localstatedir.patch ]; @@ -37,6 +37,13 @@ stdenv.mkDerivation rec { avahi-core/socket.c ''; + postInstall = '' + # Maintain compat for mdnsresponder and howl + ${if withLibdnssdCompat then "ln -s avahi-compat-libdns_sd/dns_sd.h $out/include/dns_sd.h" else ""} + ln -s avahi-compat-howl $out/include/howl + ln -s avahi-compat-howl.pc $out/lib/pkgconfig/howl.pc + ''; + meta = with stdenv.lib; { description = "mDNS/DNS-SD implementation"; homepage = http://avahi.org; |