diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2011-07-01 15:51:55 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2011-07-01 15:51:55 +0000 |
| commit | fef7d9197eded1395c01b5af0590d2a726a69f4b (patch) | |
| tree | 243ef66a3afc0531ac8ca8775f8d3dbe67fd6031 /pkgs/development/libraries/libunistring | |
| parent | b2ec2c245ac6bab808bffef86e844923a4f81258 (diff) | |
| download | nixpkgs-fef7d9197eded1395c01b5af0590d2a726a69f4b.tar nixpkgs-fef7d9197eded1395c01b5af0590d2a726a69f4b.tar.gz nixpkgs-fef7d9197eded1395c01b5af0590d2a726a69f4b.tar.bz2 nixpkgs-fef7d9197eded1395c01b5af0590d2a726a69f4b.tar.lz nixpkgs-fef7d9197eded1395c01b5af0590d2a726a69f4b.tar.xz nixpkgs-fef7d9197eded1395c01b5af0590d2a726a69f4b.tar.zst nixpkgs-fef7d9197eded1395c01b5af0590d2a726a69f4b.zip | |
libunistring: Make libiconv a propagated input when cross-building for MinGW.
svn path=/nixpkgs/trunk/; revision=27577
Diffstat (limited to 'pkgs/development/libraries/libunistring')
| -rw-r--r-- | pkgs/development/libraries/libunistring/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index 590ad64cb40..9bc3cb7f901 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 . |