public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

opencv: fix build on i686 by upstream patch

Browse Source 
CC maintainers @viric, @flosse, #5356.
This commit is contained in:
Vladimír Čunát 2014-12-25 13:05:48 +01:00
parent ed4eee3a06
commit 9c94c42af8
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/opencv/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg { 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 }: , enableBloat ? false }:
let v = "2.4.10"; in let v = "2.4.10"; in
@ -12,6 +12,11 @@ stdenv.mkDerivation rec {
sha256 = "1ilnfm7id8jqg5xmfjhbq81sjxx64av90kwxcs8zv5rp523wpx0v"; sha256 = "1ilnfm7id8jqg5xmfjhbq81sjxx64av90kwxcs8zv5rp523wpx0v";
}; };
patches = [(fetchpatch {
url = "https://github.com/Itseez/opencv/commit/ea50be0529c24.diff";
sha256 = "0nm02v7rmfcndj3jzmv3mrqh3hk5n6axx6gdxndyhabn201hqswn";
})];
buildInputs = buildInputs =
[ unzip libjpeg libpng libtiff ] [ unzip libjpeg libpng libtiff ]
++ lib.optionals enableBloat [ gtk glib jasper ffmpeg xineLib gstreamer python27 python27Packages.numpy ]; ++ lib.optionals enableBloat [ gtk glib jasper ffmpeg xineLib gstreamer python27 python27Packages.numpy ];