Author: ludo Date: Fri Jul 1 15:51:55 2011 New Revision: 27577 URL: https://svn.nixos.org/websvn/nix/?rev=27577&sc=1
Log: libunistring: Make libiconv a propagated input when cross-building for MinGW. Modified: nixpkgs/trunk/pkgs/development/libraries/libunistring/default.nix Modified: nixpkgs/trunk/pkgs/development/libraries/libunistring/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/development/libraries/libunistring/default.nix Fri Jul 1 13:42:17 2011 (r27576) +++ nixpkgs/trunk/pkgs/development/libraries/libunistring/default.nix Fri Jul 1 15:51:55 2011 (r27577) @@ -9,7 +9,10 @@ }; 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 . _______________________________________________ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
