Author: urkud
Date: Thu Apr 5 15:11:19 2012
New Revision: 33624
URL: https://nixos.org/websvn/nix/?rev=33624&sc=1
Log:
avahi: use libiconv if needed
Modified:
nixpkgs/trunk/pkgs/development/libraries/avahi/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/avahi/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/avahi/default.nix Thu Apr 5
14:50:31 2012 (r33623)
+++ nixpkgs/trunk/pkgs/development/libraries/avahi/default.nix Thu Apr 5
15:11:19 2012 (r33624)
@@ -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 @@
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 ];
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Apr 5 14:50:31
2012 (r33623)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Apr 5 15:11:19
2012 (r33624)
@@ -4084,9 +4084,11 @@
libiconv = callPackage ../development/libraries/libiconv { };
+ libiconvOrEmpty = if (libiconvOrNull == null) then [] 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 { };
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
