From 71760b99a5e9fa8460bf53e80095f341e2d1664d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 20 Apr 2010 15:09:56 +0000
Subject: [PATCH] Fixing the opencv build. As it builds with cmake, it also
 benefits from 'stdenv2' to build properly.

svn path=/nixpkgs/trunk/; revision=21184
---
 pkgs/development/libraries/opencv/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix               | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix
index 244c3886822..1a295f7da7d 100644
--- a/pkgs/development/libraries/opencv/default.nix
+++ b/pkgs/development/libraries/opencv/default.nix
@@ -2,11 +2,11 @@
   xineLib, gstreamer }:
 
 stdenv.mkDerivation rec {
-  name = "opencv-2.0.0";
+  name = "opencv-2.1.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/opencvlibrary/OpenCV-2.0.0.tar.bz2";
-    sha256 = "08h03qzawj6zwifrh8rq66y4cya1kxx9ixrbq7phlac79nbvjzf1";
+    url = "mirror://sourceforge/opencvlibrary/OpenCV-2.1.0.tar.bz2";
+    sha256 = "0zrr24hr64gz35qb95nsvvbmdf89biglpy9z14y5kaxh5baiy1i6";
   };
 
   buildInputs = [ cmake gtk glib libjpeg libpng libtiff jasper ffmpeg pkgconfig
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab1a67993eb..216716bb7e1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4735,10 +4735,11 @@ let
   };
 
   opencv = import ../development/libraries/opencv {
-      inherit fetchurl stdenv cmake libjpeg libpng libtiff jasper ffmpeg
+      inherit fetchurl cmake libjpeg libpng libtiff jasper ffmpeg
           pkgconfig xineLib;
       inherit (gtkLibs) gtk glib;
       inherit (gst_all) gstreamer;
+      stdenv = stdenv2; 
   };
 
   # this ctl version is needed by openexr_viewers