From de9c8771bdfdf9f7938b61989af68c1c58281001 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 19 Sep 2009 22:17:11 +0000
Subject: [PATCH] GNU libunistring 0.9.1.1.

svn path=/nixpkgs/trunk/; revision=17287
---
 pkgs/development/libraries/libunistring/default.nix | 11 ++++++++---
 pkgs/top-level/all-packages.nix                     |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix
index 05dd2cdaaf5e..02054f33ffdc 100644
--- a/pkgs/development/libraries/libunistring/default.nix
+++ b/pkgs/development/libraries/libunistring/default.nix
@@ -1,13 +1,18 @@
-{ fetchurl, stdenv }:
+{ fetchurl, stdenv, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "libunistring-0.9.1";
+  name = "libunistring-0.9.1.1";
 
   src = fetchurl {
     url = "mirror://gnu/libunistring/${name}.tar.gz";
-    sha256 = "0cisnd4psxhgwlb8ak4hn74zdayp9s48i5rzrl6xmni1dqz6j6y5";
+    sha256 = "02qrsncjn7r350p1wgggkg14gbw2r4g4a7awvrggfriqs6nl5qf5";
   };
 
+  buildInputs =
+    stdenv.lib.optional (stdenv.system == "i686-cygwin"
+                         || stdenv.system == "i686-darwin")
+                        libiconv;
+
   doCheck = true;
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0b22b09bdab4..266533bc2d58 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3779,7 +3779,7 @@ let
   };
 
   libunistring = import ../development/libraries/libunistring {
-    inherit fetchurl stdenv;
+    inherit fetchurl stdenv libiconv;
   };
 
   libupnp = import ../development/libraries/pupnp {