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

Fixing the opencv build. As it builds with cmake, it also benefits from 'stdenv2'

Browse Source 
to build properly.

svn path=/nixpkgs/trunk/; revision=21184
This commit is contained in:
Lluís Batlle i Rossell 2010-04-20 15:09:56 +00:00
parent fbc33c5485
commit 71760b99a5
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,11 +2,11 @@
xineLib, gstreamer }: xineLib, gstreamer }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "opencv-2.0.0"; name = "opencv-2.1.0";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/opencvlibrary/OpenCV-2.0.0.tar.bz2"; url = "mirror://sourceforge/opencvlibrary/OpenCV-2.1.0.tar.bz2";
sha256 = "08h03qzawj6zwifrh8rq66y4cya1kxx9ixrbq7phlac79nbvjzf1"; sha256 = "0zrr24hr64gz35qb95nsvvbmdf89biglpy9z14y5kaxh5baiy1i6";
}; };
buildInputs = [ cmake gtk glib libjpeg libpng libtiff jasper ffmpeg pkgconfig buildInputs = [ cmake gtk glib libjpeg libpng libtiff jasper ffmpeg pkgconfig

3
pkgs/top-level/all-packages.nix
View File

@ -4735,10 +4735,11 @@ let
}; };
opencv = import ../development/libraries/opencv { opencv = import ../development/libraries/opencv {
inherit fetchurl stdenv cmake libjpeg libpng libtiff jasper ffmpeg inherit fetchurl cmake libjpeg libpng libtiff jasper ffmpeg
pkgconfig xineLib; pkgconfig xineLib;
inherit (gtkLibs) gtk glib; inherit (gtkLibs) gtk glib;
inherit (gst_all) gstreamer; inherit (gst_all) gstreamer;
stdenv = stdenv2;
}; };
# this ctl version is needed by openexr_viewers # this ctl version is needed by openexr_viewers