diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-12-25 13:05:48 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-12-25 16:52:39 +0100 |
| commit | 9c94c42af80008546b5cefc8f2f686bcbefe21e3 (patch) | |
| tree | 8a835d225ab7ffbeab4f554481053e57b15a3e5d /pkgs | |
| parent | ed4eee3a066d1f1bb79302ee868a2aa14376af8f (diff) | |
| download | nixlib-9c94c42af80008546b5cefc8f2f686bcbefe21e3.tar nixlib-9c94c42af80008546b5cefc8f2f686bcbefe21e3.tar.gz nixlib-9c94c42af80008546b5cefc8f2f686bcbefe21e3.tar.bz2 nixlib-9c94c42af80008546b5cefc8f2f686bcbefe21e3.tar.lz nixlib-9c94c42af80008546b5cefc8f2f686bcbefe21e3.tar.xz nixlib-9c94c42af80008546b5cefc8f2f686bcbefe21e3.tar.zst nixlib-9c94c42af80008546b5cefc8f2f686bcbefe21e3.zip | |
opencv: fix build on i686 by upstream patch
CC maintainers @viric, @flosse, #5356.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/opencv/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index fe4aaecbfe38..7814e88f6931 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 ]; |