Fixing libdecodeqr build by using previous OpenCV

svn path=/nixpkgs/trunk/; revision=28169
This commit is contained in:
Michael Raskin 2011-08-05 16:13:20 +00:00
parent 55fa5b5d1d
commit a12937570c
2 changed files with 35 additions and 1 deletions

View file

@ -0,0 +1,28 @@
{ stdenv, fetchurl, cmake, gtk, glib, libjpeg, libpng, libtiff, jasper, ffmpeg, pkgconfig,
xineLib, gstreamer }:
stdenv.mkDerivation rec {
name = "opencv-2.1.0";
src = fetchurl {
url = "mirror://sourceforge/opencvlibrary/OpenCV-2.1.0.tar.bz2";
sha256 = "26061fd52ab0ab593c093ff94b5f5c09b956d7deda96b47019ff11932111397f";
};
buildInputs = [ cmake gtk glib libjpeg libpng libtiff jasper ffmpeg pkgconfig
xineLib gstreamer ];
enableParallelBuilding = true;
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -D__STDC_CONSTANT_MACROS "
'';
meta = {
description = "Open Computer Vision Library with more than 500 algorithms";
homepage = http://opencv.willowgarage.com/;
license = "BSD";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
};
}

View file

@ -4117,6 +4117,11 @@ let
inherit (gst_all) gstreamer;
};
opencv_2_1 = callPackage ../development/libraries/opencv/2.1.nix {
ffmpeg = ffmpeg_0_6_90;
inherit (gst_all) gstreamer;
};
# this ctl version is needed by openexr_viewers
openexr_ctl = callPackage ../development/libraries/openexr_ctl { };
@ -6509,7 +6514,8 @@ let
};
qrdecode = builderDefsPackage (import ../tools/graphics/qrdecode) {
inherit libpng opencv;
inherit libpng;
opencv = opencv_2_1;
};
qrencode = builderDefsPackage (import ../tools/graphics/qrencode) {