Author: raskin
Date: Fri Aug 5 16:13:20 2011
New Revision: 28169
URL: https://svn.nixos.org/websvn/nix/?rev=28169&sc=1
Log:
Fixing libdecodeqr build by using previous OpenCV
Added:
nixpkgs/trunk/pkgs/development/libraries/opencv/2.1.nix
- copied, changed from r28157,
nixpkgs/trunk/pkgs/development/libraries/opencv/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Copied and modified: nixpkgs/trunk/pkgs/development/libraries/opencv/2.1.nix
(from r28157, nixpkgs/trunk/pkgs/development/libraries/opencv/default.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/opencv/default.nix Thu Aug 4
16:01:50 2011 (r28157, copy source)
+++ nixpkgs/trunk/pkgs/development/libraries/opencv/2.1.nix Fri Aug 5
16:13:20 2011 (r28169)
@@ -2,11 +2,11 @@
xineLib, gstreamer }:
stdenv.mkDerivation rec {
- name = "opencv-2.3.0";
+ name = "opencv-2.1.0";
src = fetchurl {
- url = "mirror://sourceforge/opencvlibrary/OpenCV-2.3.0.tar.bz2";
- sha256 = "02wl56a87if84brrhd4wq59linyhbxx30ykh4cjwzw37yw7zzgxw";
+ url = "mirror://sourceforge/opencvlibrary/OpenCV-2.1.0.tar.bz2";
+ sha256 =
"26061fd52ab0ab593c093ff94b5f5c09b956d7deda96b47019ff11932111397f";
};
buildInputs = [ cmake gtk glib libjpeg libpng libtiff jasper ffmpeg pkgconfig
@@ -14,6 +14,10 @@
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/;
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Aug 5 14:02:57
2011 (r28168)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Aug 5 16:13:20
2011 (r28169)
@@ -4117,6 +4117,11 @@
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 @@
};
qrdecode = builderDefsPackage (import ../tools/graphics/qrdecode) {
- inherit libpng opencv;
+ inherit libpng;
+ opencv = opencv_2_1;
};
qrencode = builderDefsPackage (import ../tools/graphics/qrencode) {
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
