Remove libcv; reference opencv instead.
svn path=/nixpkgs/trunk/; revision=24272
This commit is contained in:
parent
494ba6a813
commit
dc1f986944
@ -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";
|
||||
};
|
||||
}
|
@ -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) {
|
||||
|
Loading…
Reference in New Issue
Block a user