diff options
| author | David McFarland <corngood@gmail.com> | 2017-05-23 10:36:56 -0300 |
|---|---|---|
| committer | David McFarland <corngood@gmail.com> | 2017-06-26 09:33:25 -0300 |
| commit | cbc0db08f948a762ee4b3f7f9ded47a034f5d9fa (patch) | |
| tree | 1efd4da4f4db559bc7d1f594e083e8fa9288de19 | |
| parent | c580ab4fcf18db191fba337ca41757ff0c9cfc14 (diff) | |
| download | nixpkgs-cbc0db08f948a762ee4b3f7f9ded47a034f5d9fa.tar nixpkgs-cbc0db08f948a762ee4b3f7f9ded47a034f5d9fa.tar.gz nixpkgs-cbc0db08f948a762ee4b3f7f9ded47a034f5d9fa.tar.bz2 nixpkgs-cbc0db08f948a762ee4b3f7f9ded47a034f5d9fa.tar.lz nixpkgs-cbc0db08f948a762ee4b3f7f9ded47a034f5d9fa.tar.xz nixpkgs-cbc0db08f948a762ee4b3f7f9ded47a034f5d9fa.tar.zst nixpkgs-cbc0db08f948a762ee4b3f7f9ded47a034f5d9fa.zip | |
zlib: fix cygwin build
| -rw-r--r-- | pkgs/development/libraries/zlib/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/zlib/disable-cygwin-widechar.patch | 13 |
2 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index e6468771cd4..2278453c492 100644 --- 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' \ diff --git a/pkgs/development/libraries/zlib/disable-cygwin-widechar.patch b/pkgs/development/libraries/zlib/disable-cygwin-widechar.patch new file mode 100644 index 00000000000..3de4978c306 --- /dev/null +++ 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 + |