From 9c94c42af80008546b5cefc8f2f686bcbefe21e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 25 Dec 2014 13:05:48 +0100
Subject: [PATCH] opencv: fix build on i686 by upstream patch

CC maintainers @viric, @flosse, #5356.
---
 pkgs/development/libraries/opencv/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix
index fe4aaecbfe3..7814e88f693 100644
--- a/pkgs/development/libraries/opencv/default.nix
+++ b/pkgs/development/libraries/opencv/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg
-, pkgconfig, gstreamer, xineLib, glib, python27, python27Packages, unzip
+, fetchpatch, pkgconfig, gstreamer, xineLib, glib, python27, python27Packages, unzip
 , enableBloat ? false }:
 
 let v = "2.4.10"; in
@@ -12,6 +12,11 @@ stdenv.mkDerivation rec {
     sha256 = "1ilnfm7id8jqg5xmfjhbq81sjxx64av90kwxcs8zv5rp523wpx0v";
   };
 
+  patches = [(fetchpatch {
+    url = "https://github.com/Itseez/opencv/commit/ea50be0529c24.diff";
+    sha256 = "0nm02v7rmfcndj3jzmv3mrqh3hk5n6axx6gdxndyhabn201hqswn";
+  })];
+
   buildInputs =
     [ unzip libjpeg libpng libtiff ]
     ++ lib.optionals enableBloat [ gtk glib jasper ffmpeg xineLib gstreamer python27 python27Packages.numpy ];