Merge pull request #104478 from Mic92/opencv

2020-11-23 17:51:33 +01:00
parent ca021e9c32 dae00908a8
commit 816009490e
3 changed files with 5 additions and 7 deletions
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -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

--- a/pkgs/tools/graphics/gmic/default.nix
+++ b/pkgs/tools/graphics/gmic/default.nix
@@ -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
  ];
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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 {};