diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-04-02 16:45:48 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-04-02 16:45:48 +0000 |
| commit | 8ba23e138d9714bf309facf0003d69b1f8b86265 (patch) | |
| tree | 9412925f611693a9a3ff880c10392b3763eafecb /pkgs/development/libraries/zlib/disable-cygwin-widechar.patch | |
| parent | 040d8929bd4548fd0e2969476eb227f920ae06b8 (diff) | |
| parent | 66754ae952bb2ffd16e793f4be00ffecb9253e28 (diff) | |
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts: pkgs/development/libraries/zlib/default.nix pkgs/development/lua-modules/overrides.nix
Diffstat (limited to 'pkgs/development/libraries/zlib/disable-cygwin-widechar.patch')
| -rw-r--r-- | pkgs/development/libraries/zlib/disable-cygwin-widechar.patch | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/pkgs/development/libraries/zlib/disable-cygwin-widechar.patch b/pkgs/development/libraries/zlib/disable-cygwin-widechar.patch deleted file mode 100644 index 3de4978c30661..0000000000000 --- a/pkgs/development/libraries/zlib/disable-cygwin-widechar.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 - |