From 4e029cf721faa72a5ff091387739471c90f0740d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 19 Sep 2009 12:21:39 +0000
Subject: [PATCH] GNU gettext: Fix {Cyg,Dar}win hack.

svn path=/nixpkgs/trunk/; revision=17274
---
 .../development/libraries/gettext/default.nix | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index 3e7b78d7ff3..627b918897a 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
   name = "gettext-0.17";
   
   src = fetchurl {
@@ -40,19 +40,23 @@ stdenv.mkDerivation rec {
 
 //
 
-(if (stdenv.system == "i686-darwin")
-    then (stdenv.mkDerivation rec {
-      name = "libiconv-1.13.1";
+(if (stdenv.system == "i686-darwin" || stdenv.system == "i686-cygwin")
+    then {
+      buildInputs = [
+        stdenv.mkDerivation rec {
+          name = "libiconv-1.13.1";
 
-      src = fetchurl {
-        url = "mirror://gnu/libiconv/${name}.tar.gz";
-        sha256 = "0jcsjk2g28bq20yh7rvbn8xgq6q42g8dkkac0nfh12b061l638sm";
-      };
+          src = fetchurl {
+            url = "mirror://gnu/libiconv/${name}.tar.gz";
+            sha256 = "0jcsjk2g28bq20yh7rvbn8xgq6q42g8dkkac0nfh12b061l638sm";
+          };
 
-      meta = {
-        description = "GNU libiconv, an iconv(3) implementation";
-        homepage = http://www.gnu.org/software/libiconv/;
-        license = "LGPLv2+";
-      };
-    })
-    else {})
+          meta = {
+            description = "GNU libiconv, an iconv(3) implementation";
+            homepage = http://www.gnu.org/software/libiconv/;
+            license = "LGPLv2+";
+          };
+        }
+      ];
+    }
+    else {}))