diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-02-10 12:40:20 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-23 10:52:04 +0200 |
| commit | 7d4ebb526caa9904dc45e5905dd2e4d90f912979 (patch) | |
| tree | 08fcdb3da0c4456779da836be95f13673734b87d /pkgs/development/libraries/libjpeg-turbo | |
| parent | bd3d377e5eff3521de386c298c9bd89b132f2ad0 (diff) | |
| download | nixpkgs-7d4ebb526caa9904dc45e5905dd2e4d90f912979.tar nixpkgs-7d4ebb526caa9904dc45e5905dd2e4d90f912979.tar.gz nixpkgs-7d4ebb526caa9904dc45e5905dd2e4d90f912979.tar.bz2 nixpkgs-7d4ebb526caa9904dc45e5905dd2e4d90f912979.tar.lz nixpkgs-7d4ebb526caa9904dc45e5905dd2e4d90f912979.tar.xz nixpkgs-7d4ebb526caa9904dc45e5905dd2e4d90f912979.tar.zst nixpkgs-7d4ebb526caa9904dc45e5905dd2e4d90f912979.zip | |
libjpeg(-turbo): fix on mingw
By porting a patch from msys2.
Diffstat (limited to 'pkgs/development/libraries/libjpeg-turbo')
| -rw-r--r-- | pkgs/development/libraries/libjpeg-turbo/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/libjpeg-turbo/mingw-boolean.patch | 19 |
2 files changed, 23 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index da4d3a9822f..c326e630bd0 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -8,6 +8,10 @@ stdenv.mkDerivation rec { sha256 = "0gi349hp1x7mb98s4mf66sb2xay2kjjxj9ihrriw0yiy0k9va6sj"; }; + patches = + stdenv.lib.optional (stdenv.cross.libc or null == "msvcrt") + ./mingw-boolean.patch; + outputs = [ "dev" "out" "doc" "bin" ]; nativeBuildInputs = [ nasm ]; diff --git a/pkgs/development/libraries/libjpeg-turbo/mingw-boolean.patch b/pkgs/development/libraries/libjpeg-turbo/mingw-boolean.patch new file mode 100644 index 00000000000..9b9483d6398 --- /dev/null +++ b/pkgs/development/libraries/libjpeg-turbo/mingw-boolean.patch @@ -0,0 +1,19 @@ +Ported to updated libjpeg-turbo from +https://github.com/msys2/MINGW-packages/blob/master/mingw-w64-libjpeg-turbo/jpeg-typedefs.patch +--- a/jmorecfg.h 2012-02-10 06:47:55 +0300 ++++ b/jmorecfg.h 2012-05-03 10:29:13 +0400 +@@ -224,7 +224,13 @@ + * Defining HAVE_BOOLEAN before including jpeglib.h should make it work. + */ + +-#ifndef HAVE_BOOLEAN ++#if defined(_WIN32) && !defined(HAVE_BOOLEAN) ++#ifndef __RPCNDR_H__ ++typedef unsigned char boolean; ++#endif ++#define HAVE_BOOLEAN ++#endif ++#if !defined(HAVE_BOOLEAN) && !defined(__RPCNDR_H__) + typedef int boolean; + #endif + #ifndef FALSE /* in case these macros already exist */ |