From 96275e218802ff6dc03d72f97482f2a7b9a98f7f Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 9 Feb 2026 14:36:28 +0300 Subject: [PATCH] krita-unwrapped: 5.2.15 -> 6.0.0, switch to Qt6 --- pkgs/by-name/kr/krita-unwrapped/package.nix | 46 ++++++++------------- 1 file changed, 17 insertions(+), 29 deletions(-) diff --git a/pkgs/by-name/kr/krita-unwrapped/package.nix b/pkgs/by-name/kr/krita-unwrapped/package.nix index b354e813bce2..94685a4c48dd 100644 --- a/pkgs/by-name/kr/krita-unwrapped/package.nix +++ b/pkgs/by-name/kr/krita-unwrapped/package.nix @@ -4,10 +4,8 @@ boost, cmake, curl, - eigen, + eigen_5, exiv2, - extra-cmake-modules, - fetchpatch, fetchurl, fftw, fribidi, @@ -24,7 +22,8 @@ libjxl, libmypaint, libraw, - libsForQt5, + qt6, + kdePackages, libunibreak, libwebp, opencolorio, @@ -39,34 +38,25 @@ stdenv.mkDerivation (finalAttrs: { pname = "krita-unwrapped"; - version = "5.2.15"; + version = "6.0.0"; src = fetchurl { url = "mirror://kde/stable/krita/${finalAttrs.version}/krita-${finalAttrs.version}.tar.gz"; - hash = "sha256-m5T4Qh2XZ8KU3vWY+xBwfd5usje67KJZBmn7DUuQOzk="; + hash = "sha256-kytodhJvfGKeQn7j0BIwDIKGsFoYQnc1S0FK9kGg8e0="; }; - patches = [ - # Fixes build with SIP 6.8 - (fetchpatch { - name = "bump-SIP-ABI-version-to-12.8.patch"; - url = "https://invent.kde.org/graphics/krita/-/commit/2d71c47661d43a4e3c1ab0c27803de980bdf2bb2.diff"; - hash = "sha256-U3E44nj4vra++PJV20h4YHjES78kgrJtr4ktNeQfOdA="; - }) - ]; - nativeBuildInputs = [ cmake - extra-cmake-modules + kdePackages.extra-cmake-modules pkg-config python3Packages.sip - libsForQt5.wrapQtAppsHook + qt6.wrapQtAppsHook ]; buildInputs = [ boost libraw fftw - eigen + eigen_5 exiv2 fribidi lcms2 @@ -90,9 +80,12 @@ stdenv.mkDerivation (finalAttrs: { libwebp SDL2 zug - python3Packages.pyqt5 + python3Packages.pyqt6 + + qt6.qtmultimedia + qt6.qttools ] - ++ (with libsForQt5; [ + ++ (with kdePackages; [ breeze-icons karchive kcompletion @@ -108,16 +101,10 @@ stdenv.mkDerivation (finalAttrs: { kwindowsystem mlt poppler - qtmultimedia - qtx11extras quazip - - # TODO: reenable libkdcraw when migrating to Qt6, see #430298 - # libkdcraw + libkdcraw ]); - env.NIX_CFLAGS_COMPILE = toString (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 = @@ -143,8 +130,9 @@ stdenv.mkDerivation (finalAttrs: { cmakeBuildType = "RelWithDebInfo"; cmakeFlags = [ - "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings" - "-DPYQT_SIP_DIR_OVERRIDE=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings" + "-DBUILD_WITH_QT6=ON" + "-DALLOW_UNSTABLE=QT6" + "-DENABLE_UPDATERS=OFF" "-DBUILD_KRITA_QT_DESIGNER_PLUGINS=ON" ];