From dc1f9869440735da324218109df76978480b8115 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 14 Oct 2010 10:45:36 +0000
Subject: [PATCH] Remove libcv; reference opencv instead.

svn path=/nixpkgs/trunk/; revision=24272
---
 pkgs/development/libraries/libcv/default.nix | 33 --------------------
 pkgs/top-level/all-packages.nix              |  7 +----
 2 files changed, 1 insertion(+), 39 deletions(-)
 delete mode 100644 pkgs/development/libraries/libcv/default.nix

diff --git a/pkgs/development/libraries/libcv/default.nix b/pkgs/development/libraries/libcv/default.nix
deleted file mode 100644
index a2035b4cb406..000000000000
--- a/pkgs/development/libraries/libcv/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-args :  
-let 
-  lib = args.lib;
-  fetchurl = args.fetchurl;
-  fullDepEntry = args.fullDepEntry;
-
-  version = lib.attrByPath ["version"] "" args; 
-  buildInputs = with args; [
-    libtiff libpng libjpeg pkgconfig 
-    gtk glib
-  ];
-in
-rec {
-  src = fetchurl {
-    url = ftp://ftp.debian.org/debian/pool/main/o/opencv/opencv_0.9.7.orig.tar.gz;
-    sha256 = "14qnm59gn518gjxwjb9hm3ij0b1awlxa76qdvnn5ygxsx713lf2j";
-  };
-
-  inherit buildInputs;
-  configureFlags = [];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doConfigure" "doMakeInstall" "postInstall"];
-
-  postInstall = fullDepEntry (''
-    ln -s $out/include/opencv/* $out/include
-  '') ["doMakeInstall" "minInit"];
-      
-  name = "libcv-0.9.7";
-  meta = {
-    description = "libcv - computer vision library";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3f4e65bbccaf..30ceedbd3f8d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3177,11 +3177,6 @@ let
 
   libcue = callPackage ../development/libraries/libcue { };
 
-  libcv = builderDefsPackage (import ../development/libraries/libcv) {
-    inherit libtiff libjpeg libpng pkgconfig;
-    inherit (gtkLibs) gtk glib;
-  };
-
   libdaemon = callPackage ../development/libraries/libdaemon { };
 
   libdbi = callPackage ../development/libraries/libdbi { };
@@ -5672,7 +5667,7 @@ let
   };
 
   qrdecode = builderDefsPackage (import ../tools/graphics/qrdecode) {
-    inherit libpng libcv;
+    inherit libpng opencv;
   };
 
   qrencode = builderDefsPackage (import ../tools/graphics/qrencode) {