diff options
| author | André Vitor de Lima Matos <andre.vmatos@gmail.com> | 2022-04-22 21:55:35 -0300 |
|---|---|---|
| committer | André Vitor de Lima Matos <andre.vmatos@gmail.com> | 2022-04-24 19:05:46 -0300 |
| commit | 5d7333150ada24454555ed30cbf2da1dc72a86bf (patch) | |
| tree | 0595481a9184e99e14c3c8bdfd2e5beeeb1e4e4a /pkgs/applications/graphics | |
| parent | e587dcb9811bab41a9fdbc87a1d70a3a7684ecba (diff) | |
digikam: 7.4.0 -> 7.6.0
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/digikam/default.nix | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index f528d587a4176..088b0de158fb3 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook +{ mkDerivation, lib, fetchurl, fetchpatch, cmake, doxygen, extra-cmake-modules, wrapGAppsHook # For `digitaglinktree` , perl, sqlite @@ -43,6 +43,7 @@ , pcre , threadweaver , x265 +, jasper # For panorama and focus stacking , enblend-enfuse @@ -55,13 +56,21 @@ mkDerivation rec { pname = "digikam"; - version = "7.4.0"; + version = "7.6.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/digiKam-${version}.tar.xz"; - sha256 = "sha256-0Iq2bacyu0SbwQEG7BHdne+ls1Yt7TdBsEHbuqcVUEo="; + sha256 = "sha256-2OHucyHT/DE5FvUVdW4wKaxBh9xFO2kzhI1N5TFLZkE="; }; + patches = [ + (fetchpatch { + name = "akonadi-22.04.patch"; + url = "https://github.com/archlinux/svntogit-packages/raw/1b3c76a4482055524120f598325d90545ff9c020/trunk/akonadi-22.04.patch"; + sha256 = "sha256-ittgkl2t/nAD0ci2fNYoAd4E2M6Gg0vqqjxqZugBuko="; + }) + ]; + nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ]; buildInputs = [ @@ -86,6 +95,7 @@ mkDerivation rec { opencv pcre x265 + jasper qtbase qtxmlpatterns @@ -115,6 +125,7 @@ mkDerivation rec { "-DENABLE_MEDIAPLAYER=1" "-DENABLE_QWEBENGINE=on" "-DENABLE_APPSTYLES=on" + "-DCMAKE_CXX_FLAGS=-I${libksane}/include/KF5" # fix `#include <ksane_version.h>` ]; dontWrapGApps = true; |