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

Merge from trunk up through r28790

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=28792
This commit is contained in:
Shea Levy
2011-08-24 19:16:43 +00:00
parent 5d62c65d6e b58016b007
commit 4d70ba6cc9
2168 changed files with 42927 additions and 19027 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/opencv/2.1.nix
+28
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;
};
}
pkgs/development/libraries/opencv/default.nix
+3 -5
View File
@@ -2,18 +2,16 @@
xineLib, gstreamer }:
stdenv.mkDerivation rec {
name = "opencv-2.1.0";
name = "opencv-2.3.0";
src = fetchurl {
url = "mirror://sourceforge/opencvlibrary/OpenCV-2.1.0.tar.bz2";
sha256 = "0zrr24hr64gz35qb95nsvvbmdf89biglpy9z14y5kaxh5baiy1i6";
url = "mirror://sourceforge/opencvlibrary/OpenCV-2.3.0.tar.bz2";
sha256 = "02wl56a87if84brrhd4wq59linyhbxx30ykh4cjwzw37yw7zzgxw";
};
buildInputs = [ cmake gtk glib libjpeg libpng libtiff jasper ffmpeg pkgconfig
xineLib gstreamer ];
patches = [ ./changeset_r3190.diff ];
meta = {
description = "Open Computer Vision Library with more than 500 algorithms";
homepage = http://opencv.willowgarage.com/;