From 1032c4b16054789d10a73fcd2531bd666a893a71 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 26 Apr 2026 15:52:00 +0300 Subject: [PATCH] ksnip: 1.10.1 -> 1.10.1-unstable-2026-02-27, build with Qt6 --- pkgs/by-name/ks/ksnip/package.nix | 38 +++++++++++++------------------ 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/pkgs/by-name/ks/ksnip/package.nix b/pkgs/by-name/ks/ksnip/package.nix index a06b8e76337f..462b646d1e96 100644 --- a/pkgs/by-name/ks/ksnip/package.nix +++ b/pkgs/by-name/ks/ksnip/package.nix @@ -3,43 +3,37 @@ lib, cmake, fetchFromGitHub, - fetchpatch, - libsForQt5, + qt6, + kdePackages, }: stdenv.mkDerivation (finalAttrs: { pname = "ksnip"; - version = "1.10.1"; + version = "1.10.1-unstable-2026-02-27"; src = fetchFromGitHub { owner = "ksnip"; repo = "ksnip"; - tag = "v${finalAttrs.version}"; - hash = "sha256-n7YwDXd73hyrzb6L8utZFuHh9HnjVtkU6CC4jfWPj/I="; + rev = "f50e2764d0d51af2fd06c9d70f1e5f1631726975"; + hash = "sha256-XehTMbvSRHfwTy6+Rv2QavQfRs6lK1+sd04iOZZZH4c="; }; - patches = [ - # Fix build with latest kImageAnnotator - (fetchpatch { - url = "https://github.com/ksnip/ksnip/commit/76f4b381971eead6ff31b8bf3bb64bb5717469c3.patch"; - hash = "sha256-JWoI974qDNZIzr/8oksI8m6g3XNWEaQRGsqSfvQrmao="; - }) + cmakeFlags = [ + "-DBUILD_WITH_QT6=ON" + "-DQT_FIND_PRIVATE_MODULES=ON" ]; nativeBuildInputs = [ cmake - ] - ++ (with libsForQt5; [ - extra-cmake-modules - wrapQtAppsHook - qttools - ]); + kdePackages.extra-cmake-modules + qt6.wrapQtAppsHook + qt6.qttools + ]; - buildInputs = with libsForQt5; [ - kcolorpicker - kimageannotator - qtsvg - qtx11extras + buildInputs = [ + kdePackages.kcolorpicker + kdePackages.kimageannotator + qt6.qtsvg ]; meta = {