Preserve wrapper too for Krita overlay

Changes

1 changed files (+37/-27)

• ThinkPad-X1-Yoga-Gen-6/overlays.nix
  • @@ -1,32 +1,42 @@
    final: prev: { - krita = prev.krita.unwrapped.overrideAttrs (old: { + # For Qt6 and Wayland support + krita = prev.krita.overrideAttrs (old: { + name = "krita-6.0.0-prealpha"; version = "6.0.0-prealpha"; - src = prev.fetchFromGitLab { - domain = "invent.kde.org"; - owner = "graphics"; - repo = "krita"; - rev = "81586693ef6bfddefa408a9e88380ceafe8d9f54"; - hash = "sha256-bas48pyrLhHjGtdG3AccAP3NFnJ5yVTkJZI1XRDNP68="; - }; - buildInputs = map ( - x: - if x.pname == "pyqt5" || x.pname == "qtx11extras" then - prev.python3Packages.pyqt6 - else if x.pname == "poppler-qt5" then - prev.kdePackages.poppler - else - prev.kdePackages.${x.pname} or x - ) old.buildInputs; - nativeBuildInputs = map ( - x: - if x.name == "wrap-qt5-apps-hook" then prev.qt6.wrapQtAppsHook else prev.kdePackages.${x.pname} or x - ) old.nativeBuildInputs; - patches = [ ]; - cmakeFlags = [ - "-DPYQT5_SIP_DIR=${prev.python3Packages.pyqt6}/${prev.python3Packages.python.sitePackages}/PyQt6/bindings" - "-DPYQT_SIP_DIR_OVERRIDE=${prev.python3Packages.pyqt6}/${prev.python3Packages.python.sitePackages}/PyQt6/bindings" - # "-DBUILD_KRITA_QT_DESIGNER_PLUGINS=ON" - "-DBUILD_WITH_QT6=ON" + __intentionallyOverridingVersion = true; + buildCommand = + (prev.lib.strings.removeSuffix "\n\n" old.buildCommand) + " \\\n --set QT_QPA_PLATFORM wayland"; + paths = [ + (prev.krita.unwrapped.overrideAttrs (old: { + version = "6.0.0-prealpha"; + src = prev.fetchFromGitLab { + domain = "invent.kde.org"; + owner = "graphics"; + repo = "krita"; + rev = "81586693ef6bfddefa408a9e88380ceafe8d9f54"; + hash = "sha256-bas48pyrLhHjGtdG3AccAP3NFnJ5yVTkJZI1XRDNP68="; + }; + buildInputs = map ( + x: + if x.pname == "pyqt5" || x.pname == "qtx11extras" then + prev.python3Packages.pyqt6 + else if x.pname == "poppler-qt5" then + prev.kdePackages.poppler + else + prev.kdePackages.${x.pname} or x + ) old.buildInputs; + nativeBuildInputs = map ( + x: + if x.name == "wrap-qt5-apps-hook" then prev.qt6.wrapQtAppsHook else prev.kdePackages.${x.pname} or x + ) old.nativeBuildInputs; + patches = [ ]; + cmakeFlags = [ + "-DPYQT5_SIP_DIR=${prev.python3Packages.pyqt6}/${prev.python3Packages.python.sitePackages}/PyQt6/bindings" + "-DPYQT_SIP_DIR_OVERRIDE=${prev.python3Packages.pyqt6}/${prev.python3Packages.python.sitePackages}/PyQt6/bindings" + # "-DBUILD_KRITA_QT_DESIGNER_PLUGINS=ON" + "-DBUILD_WITH_QT6=ON" + ]; + })) ]; }); }