Merge pull request #104478 from Mic92/opencv

This commit is contained in:
Jörg Thalheim 2020-11-23 17:51:33 +01:00 committed by GitHub
commit 816009490e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 7 deletions

View file

@ -39,7 +39,7 @@
, marble
, libGL
, libGLU
, opencv3
, opencv
, pcre
, threadweaver
, x265
@ -83,7 +83,7 @@ mkDerivation rec {
libusb1
libGL
libGLU
opencv3
opencv
pcre
x265

View file

@ -3,7 +3,7 @@
, cmake
, ninja
, pkg-config
, opencv3
, opencv
, openexr
, graphicsmagick
, fftw
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
libjpeg
libtiff
libpng
opencv3
opencv
openexr
graphicsmagick
];

View file

@ -25263,9 +25263,7 @@ in
dhewm3 = callPackage ../games/dhewm3 {};
digikam = libsForQt514.callPackage ../applications/graphics/digikam {
opencv3 = opencv3WithoutCuda;
};
digikam = libsForQt514.callPackage ../applications/graphics/digikam {};
displaycal = callPackage ../applications/graphics/displaycal {};