diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-04-27 18:02:29 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-27 18:02:29 +0000 |
commit | 2d8612d4c3977214bc017c64fc73591e3593b334 (patch) | |
tree | 0a9cfadd22c798da2c6c07fcf7e0cc758c3db99f /pkgs/applications/graphics | |
parent | 9611466e74dd3532ce738c509ae1522af02e789c (diff) | |
parent | 565df1946d8c4394f9aa2af3f1d86748a94f7c4b (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/digikam/default.nix | 17 | ||||
-rw-r--r-- | pkgs/applications/graphics/skanpage/default.nix | 36 |
2 files changed, 14 insertions, 39 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; diff --git a/pkgs/applications/graphics/skanpage/default.nix b/pkgs/applications/graphics/skanpage/default.nix deleted file mode 100644 index bee04cbad52c1..0000000000000 --- a/pkgs/applications/graphics/skanpage/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, mkDerivation -, fetchurl -, extra-cmake-modules -, kirigami2 -, ktextwidgets -, libksane -, qtquickcontrols2 -}: - -mkDerivation rec { - pname = "skanpage"; - version = "1.0.0"; - - src = fetchurl { - url = "mirror://kde/stable/skanpage/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-kPVAG64oPkKF3ztHB4V7M2xc1AcvwiHnYpMMLMQNYGA="; - }; - - nativeBuildInputs = [ extra-cmake-modules ]; - - buildInputs = [ - kirigami2 - ktextwidgets - libksane - qtquickcontrols2 - ]; - - meta = with lib; { - description = "KDE utility to scan images and multi-page documents"; - homepage = "https://apps.kde.org/skanpage"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; - platforms = platforms.linux; - }; -} |