From 449e03648a2b75cf03a7fb6c36224f5ac52c99a9 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 24 Sep 2011 20:40:58 +0000 Subject: [PATCH] opencv-2.3.1a * pkgconfig and cmake are buildNativeInputs * drop xineLib dependency. It was not used anyway. svn path=/nixpkgs/trunk/; revision=29473 --- pkgs/development/libraries/opencv/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 95a8f0d8fdb0..05db48095c3c 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -1,16 +1,19 @@ -{ stdenv, fetchurl, cmake, gtk, glib, libjpeg, libpng, libtiff, jasper, ffmpeg, pkgconfig, - xineLib, gstreamer }: +{ stdenv, fetchurl, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg +, pkgconfig, gstreamer }: + +let v = "2.3.1a"; in stdenv.mkDerivation rec { - name = "opencv-2.3.0"; + name = "opencv-${v}"; src = fetchurl { - url = "mirror://sourceforge/opencvlibrary/OpenCV-2.3.0.tar.bz2"; - sha256 = "02wl56a87if84brrhd4wq59linyhbxx30ykh4cjwzw37yw7zzgxw"; + url = "mirror://sourceforge/opencvlibrary/OpenCV-${v}.tar.bz2"; + sha256 = "0325s7pa2npcw2gc06pr6q5ik4xdyf08rvkfc0myn10w20lzb8m9"; }; - buildInputs = [ cmake gtk glib libjpeg libpng libtiff jasper ffmpeg pkgconfig - xineLib gstreamer ]; + buildInputs = [ gtk libjpeg libpng libtiff jasper ffmpeg gstreamer ]; + + buildNativeInputs = [ cmake pkgconfig ]; enableParallelBuilding = true;