zlib: fix cygwin build

2017-05-23 10:36:56 -03:00 · 2017-05-23 10:36:56 -03:00 · cbc0db08f9
commit cbc0db08f9
parent c580ab4fcf
2 changed files with 15 additions and 0 deletions
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
    sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1";
  };

+  patches = stdenv.lib.optional hostPlatform.isCygwin ./disable-cygwin-widechar.patch;
+
  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
    substituteInPlace configure \
      --replace '/usr/bin/libtool' 'ar' \
--- a/pkgs/development/libraries/zlib/disable-cygwin-widechar.patch
+++ b/pkgs/development/libraries/zlib/disable-cygwin-widechar.patch
@ -0,0 +1,13 @@
+diff --git a/gzguts.h b/gzguts.h
+index 990a4d2..6378d46 100644
+--- a/gzguts.h
+++ b/gzguts.h
+@@ -39,7 +39,7 @@
+ #  include <io.h>
+ #endif
+ 
+-#if defined(_WIN32) || defined(__CYGWIN__)
+#if defined(_WIN32)
+ #  define WIDECHAR
+ #endif
+