From fef7d9197eded1395c01b5af0590d2a726a69f4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org> Date: Fri, 1 Jul 2011 15:51:55 +0000 Subject: [PATCH] libunistring: Make libiconv a propagated input when cross-building for MinGW. svn path=/nixpkgs/trunk/; revision=27577 --- pkgs/development/libraries/libunistring/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index 590ad64cb40f..9bc3cb7f9012 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -9,7 +9,10 @@ stdenv.mkDerivation (rec { }; propagatedBuildInputs = - stdenv.lib.optional (! (stdenv ? glibc)) libiconv; + stdenv.lib.optional ((! (stdenv ? glibc)) + || (stdenv ? cross && + stdenv.cross.config == "i686-pc-mingw32")) + libiconv; # XXX: There are test failures on non-GNU systems, see # http://lists.gnu.org/archive/html/bug-libunistring/2010-02/msg00004.html .