From dae00908a862208bbc299bd775e9101397f9cc24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 21 Nov 2020 09:41:50 +0100 Subject: [PATCH] digikam: update opencv --- pkgs/applications/graphics/digikam/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 0654a2ed1a8..1e4b397db23 100644 --- 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7cff959dcf..ba0fe1ac3bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25218,9 +25218,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 {};