about summary refs log tree commit diff
path: root/pkgs/development/libraries/avahi
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2012-04-05 15:11:19 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2012-04-05 15:11:19 +0000
commitb4e5ce8de529d801e26eaee15fb564dee9ea022f (patch)
tree2a9077cb0b0f8a9d19460040520f1b5ab343147d /pkgs/development/libraries/avahi
parent7aeb6ef2bb061eb48cc4bff8616e8b88bea87418 (diff)
avahi: use libiconv if needed
svn path=/nixpkgs/trunk/; revision=33624
Diffstat (limited to 'pkgs/development/libraries/avahi')
-rw-r--r--pkgs/development/libraries/avahi/default.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix
index 7730e403d58a9..0789ef0ea7ca1 100644
--- a/pkgs/development/libraries/avahi/default.nix
+++ b/pkgs/development/libraries/avahi/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, libdaemon, dbus, perl, perlXMLParser
-, expat, gettext, intltool, glib, qt4 ? null, lib
+, expat, gettext, intltool, glib, qt4 ? null, libiconvOrEmpty
 , qt4Support ? false
 , withLibdnssdCompat ? false }:
 
@@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
   patches = [ ./no-mkdir-localstatedir.patch ];
 
   buildInputs = [ libdaemon dbus perl perlXMLParser glib expat ]
-    ++ (lib.optional qt4Support qt4);
+    ++ (stdenv.lib.optional qt4Support qt4)
+    ++ libiconvOrEmpty;
 
   buildNativeInputs = [ pkgconfig gettext intltool ];