diff options
author | nek0 <nek0@nek0.eu> | 2023-10-15 03:53:57 +0200 |
---|---|---|
committer | nek0 <nek0@nek0.eu> | 2023-11-30 18:02:27 +0100 |
commit | 7a40fdc288e69ba94947c1c4ec29c0f24e461eef (patch) | |
tree | f9999a1c43c0d67a86a267546853be05b94af24e /pkgs/applications/graphics | |
parent | 3542ebb79df4b261a2723187fa3f032594e43600 (diff) |
krita: 5.1.5 -> 5.2.0
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/krita/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/krita/generic.nix | 29 |
2 files changed, 16 insertions, 17 deletions
diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index e8e6a2cc9f867..ff6d8384195a7 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "5.1.5"; + version = "5.2.0"; kde-channel = "stable"; - sha256 = "1lx4x4affkbh47b7w5qvahkkr4db0vcw6h24nykak6gpy2z5wxqw"; + hash = "sha256-02oZc4pZw2dQucx1IuPJslWQGjOqwGmgeDgnUIqKkpc="; }) diff --git a/pkgs/applications/graphics/krita/generic.nix b/pkgs/applications/graphics/krita/generic.nix index ba53a94f71076..195c96fe8ccf3 100644 --- a/pkgs/applications/graphics/krita/generic.nix +++ b/pkgs/applications/graphics/krita/generic.nix @@ -2,13 +2,14 @@ , karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem , kio, kcrash, breeze-icons -, boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib, libjxl -, openjpeg, opencolorio, xsimd, poppler, curl, ilmbase, libmypaint, libwebp -, qtmultimedia, qtx11extras, quazip +, boost, libraw, fftw, eigen, exiv2, fribidi, libaom, libheif, libkdcraw, lcms2, gsl, openexr, giflib +, libjxl, mlt , openjpeg, opencolorio, xsimd, poppler, curl, ilmbase, immer, kseexpr, lager +, libmypaint , libunibreak, libwebp +, qtmultimedia, qtx11extras, quazip, SDL2, zug, pkg-config , python3Packages , version , kde-channel -, sha256 +, hash , callPackage }: @@ -18,16 +19,11 @@ mkDerivation rec { src = fetchurl { url = "https://download.kde.org/${kde-channel}/${pname}/${version}/${pname}-${version}.tar.gz"; - inherit sha256; + inherit hash; }; patches = [ (fetchpatch { - name = "exiv2-0.28.patch"; - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/krita/-/raw/acd9a818660e86b14a66fceac295c2bab318c671/exiv2-0.28.patch"; - hash = "sha256-iD2pyid513ThJVeotUlVDrwYANofnEiZmWINNUm/saw="; - }) - (fetchpatch { name = "krita-opencolorio-2.3-compat.patch"; url = "https://invent.kde.org/graphics/krita/-/commit/520c633c2c868f2236d8e56eefecdcb6e3ebd840.patch"; hash = "sha256-eXsgBN8OnKjZOQsOxViPypts6CVh3L+IYKMB/mDUcfQ="; @@ -35,16 +31,15 @@ mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ]; + nativeBuildInputs = [ cmake extra-cmake-modules pkg-config python3Packages.sip makeWrapper ]; buildInputs = [ karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons ki18n kitemmodels kitemviews kwindowsystem kio kcrash breeze-icons - boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib libjxl - openjpeg opencolorio poppler curl ilmbase libmypaint libwebp - qtmultimedia qtx11extras quazip + boost libraw fftw eigen exiv2 fribidi lcms2 gsl openexr lager libaom libheif libkdcraw giflib + libjxl mlt openjpeg opencolorio xsimd poppler curl ilmbase immer kseexpr libmypaint + libunibreak libwebp qtmultimedia qtx11extras quazip SDL2 zug python3Packages.pyqt5 - xsimd ]; env.NIX_CFLAGS_COMPILE = toString ([ "-I${ilmbase.dev}/include/OpenEXR" ] @@ -59,6 +54,9 @@ mkDerivation rec { --replace 'PYTHONPATH=''${_sip_python_path}' 'PYTHONPATH=${pythonPath}' substituteInPlace cmake/modules/SIPMacros.cmake \ --replace 'PYTHONPATH=''${_krita_python_path}' 'PYTHONPATH=${pythonPath}' + + substituteInPlace plugins/impex/jp2/jp2_converter.cc \ + --replace '<openjpeg.h>' '<${openjpeg.incDir}/openjpeg.h>' ''; cmakeBuildType = "RelWithDebInfo"; @@ -66,6 +64,7 @@ mkDerivation rec { cmakeFlags = [ "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings" "-DPYQT_SIP_DIR_OVERRIDE=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings" + "-DBUILD_KRITA_QT_DESIGNER_PLUGINS=ON" ]; preInstall = '' |