diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2022-06-04 17:46:04 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-04 17:46:04 +0200 |
commit | 1e5de56d87306c77b46fa3289c73e358425a8049 (patch) | |
tree | d08dcc332d5425018147641bf26788adc5f9d042 | |
parent | 18cce1008e8fdae525d4a3211c58a9da56628dcf (diff) | |
parent | 0c77eaeba4448c76251b57f62474b0977ed02c25 (diff) |
Merge pull request #174101 from sifmelcara/krita-5.0.6
-rw-r--r-- | pkgs/applications/graphics/krita/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/krita/generic.nix | 19 |
2 files changed, 17 insertions, 6 deletions
diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 063c5cc1551c..4aea1c4d9813 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.0.2"; + version = "5.0.6"; kde-channel = "stable"; - sha256 = "sha256-5nUfx+tQSXekiAo3brvTmVyH2tFUSGCE6COX5l1JnL8="; + sha256 = "sha256:0qhf7vm13v33yk67n7wdcgrqpk7yvajdlkqcp7zhrl2z7qdnvmzd"; }) diff --git a/pkgs/applications/graphics/krita/generic.nix b/pkgs/applications/graphics/krita/generic.nix index a0819a203e72..825e8882a557 100644 --- a/pkgs/applications/graphics/krita/generic.nix +++ b/pkgs/applications/graphics/krita/generic.nix @@ -3,7 +3,7 @@ , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem , kio, kcrash, breeze-icons , boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib -, openjpeg, opencolorio_1, vc, poppler, curl, ilmbase +, openjpeg, opencolorio_1, vc, poppler, curl, ilmbase, libmypaint, libwebp , qtmultimedia, qtx11extras, quazip , python3Packages @@ -23,13 +23,13 @@ mkDerivation rec { inherit sha256; }; - nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip_4 makeWrapper ]; + nativeBuildInputs = [ cmake extra-cmake-modules 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 - openjpeg opencolorio_1 poppler curl ilmbase + openjpeg opencolorio_1 poppler curl ilmbase libmypaint libwebp qtmultimedia qtx11extras quazip python3Packages.pyqt5 ] ++ lib.optional stdenv.hostPlatform.isx86 vc; @@ -37,6 +37,17 @@ mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ] ++ lib.optional stdenv.cc.isGNU "-Wno-deprecated-copy"; + # Krita runs custom python scripts in CMake with custom PYTHONPATH which krita determined in their CMake script. + # Patch the PYTHONPATH so python scripts can import sip successfully. + postPatch = let + pythonPath = python3Packages.makePythonPath (with python3Packages; [ sip setuptools ]); + in '' + substituteInPlace cmake/modules/FindSIP.cmake \ + --replace 'PYTHONPATH=''${_sip_python_path}' 'PYTHONPATH=${pythonPath}' + substituteInPlace cmake/modules/SIPMacros.cmake \ + --replace 'PYTHONPATH=''${_krita_python_path}' 'PYTHONPATH=${pythonPath}' + ''; + cmakeFlags = [ "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings" "-DPYQT_SIP_DIR_OVERRIDE=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings" @@ -52,7 +63,7 @@ mkDerivation rec { meta = with lib; { description = "A free and open source painting application"; homepage = "https://krita.org/"; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar sifmelcara ]; platforms = platforms.linux; license = licenses.gpl3Only; }; |