public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

avahi: use libiconv if needed

Browse Source 
svn path=/nixpkgs/trunk/; revision=33624
This commit is contained in:
Yury G. Kudryashov 2012-04-05 15:11:19 +00:00
parent 7aeb6ef2bb
commit b4e5ce8de5
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/avahi/default.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, stdenv, pkgconfig, libdaemon, dbus, perl, perlXMLParser { fetchurl, stdenv, pkgconfig, libdaemon, dbus, perl, perlXMLParser
, expat, gettext, intltool, glib, qt4 ? null, lib , expat, gettext, intltool, glib, qt4 ? null, libiconvOrEmpty
, qt4Support ? false , qt4Support ? false
, withLibdnssdCompat ? false }: , withLibdnssdCompat ? false }:
@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
patches = [ ./no-mkdir-localstatedir.patch ]; patches = [ ./no-mkdir-localstatedir.patch ];
buildInputs = [ libdaemon dbus perl perlXMLParser glib expat ] buildInputs = [ libdaemon dbus perl perlXMLParser glib expat ]
++ (lib.optional qt4Support qt4); ++ (stdenv.lib.optional qt4Support qt4)
++ libiconvOrEmpty;
buildNativeInputs = [ pkgconfig gettext intltool ]; buildNativeInputs = [ pkgconfig gettext intltool ];

4
pkgs/top-level/all-packages.nix
View File

@ -4084,9 +4084,11 @@ let
libiconv = callPackage ../development/libraries/libiconv { }; libiconv = callPackage ../development/libraries/libiconv { };
libiconvOrEmpty = if (libiconvOrNull == null) then [] else libiconv;
libiconvOrNull = if gcc ? libc then null else libiconv; libiconvOrNull = if gcc ? libc then null else libiconv;
libiconvOrLibc = if gcc ? libc then gcc.libc else libiconv; libiconvOrLibc = if (libiconvOrNull == null) then gcc.libc else libiconv;
libid3tag = callPackage ../development/libraries/libid3tag { }; libid3tag = callPackage ../development/libraries/libid3tag { };