Merge pull request #282378 from eclairevoyant/digikam

digikam: move to `pkgs/by-name`, 8.1.0 -> 8.2.0

pkgs/by-name/di/digikam/package.nix

@@ -1,25 +1,9 @@
-{ mkDerivation, config, lib, fetchpatch, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook
+{ stdenv, config, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook
 
 # For `digitaglinktree`
 , perl, sqlite
 
-, qtbase
-, qtxmlpatterns
-, qtsvg
-, qtwebengine
-, qtnetworkauth
-
-, akonadi-contacts
-, kcalendarcore
-, kconfigwidgets
-, kcoreaddons
-, kdoctools
-, kfilemetadata
-, knotifications
-, knotifyconfig
-, ktextwidgets
-, kwidgetsaddons
-, kxmlgui
+, libsForQt5
 
 , bison
 , boost
@@ -32,17 +16,13 @@
 , lcms2
 , lensfun
 , libgphoto2
-, libkipi
-, libksane
 , liblqr1
-, libqtav
 , libusb1
-, marble
+, libheif
 , libGL
 , libGLU
 , opencv
 , pcre
-, threadweaver
 , x265
 , jasper
 
@@ -51,35 +31,29 @@
 , hugin
 , gnumake
 
-, breeze-icons
-, oxygen
-
 , cudaSupport ? config.cudaSupport
 , cudaPackages ? {}
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname   = "digikam";
-  version = "8.1.0";
+  version = "8.2.0";
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/${version}/digiKam-${version}.tar.xz";
-    hash = "sha256-BQPANORF/0JPGKZxXAp6eb5KXgyCs+vEYaIc7DdFpbM=";
+    hash = "sha256-L3/LVZsSPtnsrlpa729FYO7l9JIG2dF0beyatsj7OL8=";
   };
 
-  # Fix build against exiv2 0.28.1
-  patches = [
-    (fetchpatch {
-      url = "https://invent.kde.org/graphics/digikam/-/commit/f5ea91a7f6c1926815ec68f3e0176d6c15b83051.patch";
-      hash = "sha256-5g2NaKKNKVfgW3dTO/IP/H/nZ0YAIOmdPAumy3NEaNg=";
-    })
-  ];
+  strictDeps = true;
+
+  depsBuildBuild = [ cmake ];
 
   nativeBuildInputs = [
     cmake
     doxygen
     extra-cmake-modules
-    kdoctools
+    libsForQt5.kdoctools
+    libsForQt5.wrapQtAppsHook
     wrapGAppsHook
   ] ++ lib.optionals cudaSupport (with cudaPackages; [
     cuda_nvcc
@@ -97,10 +71,8 @@ mkDerivation rec {
     lcms2
     lensfun
     libgphoto2
-    libkipi
-    libksane
+    libheif
     liblqr1
-    libqtav
     libusb1
     libGL
     libGLU
@@ -108,6 +80,10 @@ mkDerivation rec {
     pcre
     x265
     jasper
+  ] ++ (with libsForQt5; [
+    libkipi
+    libksane
+    libqtav
 
     qtbase
     qtxmlpatterns
@@ -130,7 +106,7 @@ mkDerivation rec {
     marble
     oxygen
     threadweaver
-  ] ++ lib.optionals cudaSupport (with cudaPackages; [
+  ]) ++ lib.optionals cudaSupport (with cudaPackages; [
     cuda_cudart
   ]);
 
@@ -140,7 +116,7 @@ mkDerivation rec {
     "-DENABLE_MEDIAPLAYER=1"
     "-DENABLE_QWEBENGINE=on"
     "-DENABLE_APPSTYLES=on"
-    "-DCMAKE_CXX_FLAGS=-I${libksane}/include/KF5" # fix `#include <ksane_version.h>`
+    "-DCMAKE_CXX_FLAGS=-I${libsForQt5.libksane}/include/KF5" # fix `#include <ksane_version.h>`
   ];
 
   dontWrapGApps = true;
@@ -148,7 +124,7 @@ mkDerivation rec {
   preFixup = ''
     qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
     qtWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ gnumake hugin enblend-enfuse ]})
-    qtWrapperArgs+=(--suffix DK_PLUGIN_PATH : ${placeholder "out"}/${qtbase.qtPluginPrefix}/${pname})
+    qtWrapperArgs+=(--suffix DK_PLUGIN_PATH : ${placeholder "out"}/${libsForQt5.qtbase.qtPluginPrefix}/${pname})
     substituteInPlace $out/bin/digitaglinktree \
       --replace "/usr/bin/perl" "${perl}/bin/perl" \
       --replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3"

pkgs/top-level/all-packages.nix

@@ -36867,8 +36867,6 @@ with pkgs;
 
   conmon-rs = callPackage ../applications/virtualization/conmon-rs { };
 
-  digikam = libsForQt5.callPackage ../applications/graphics/digikam { };
-
   drumkv1 = libsForQt5.callPackage ../applications/audio/drumkv1 { };
 
   eureka-ideas = callPackage ../applications/misc/eureka-ideas {