From 842819403d01b91a45bf07e80a4803096e0b606a Mon Sep 17 00:00:00 2001 From: Harinn Date: Thu, 23 Apr 2026 01:19:20 +0700 Subject: [PATCH] copyq: 13.0.0 -> 15.0.0 --- pkgs/by-name/co/copyq/package.nix | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/co/copyq/package.nix b/pkgs/by-name/co/copyq/package.nix index 0a057975b6e5..c7797d34a2ce 100644 --- a/pkgs/by-name/co/copyq/package.nix +++ b/pkgs/by-name/co/copyq/package.nix @@ -2,26 +2,27 @@ lib, stdenv, fetchFromGitHub, - fetchpatch2, cmake, ninja, qt6, + libx11, libxfixes, libxtst, wayland, + miniaudio, pkg-config, kdePackages, }: stdenv.mkDerivation (finalAttrs: { pname = "CopyQ"; - version = "13.0.0"; + version = "15.0.0"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; - rev = "v${finalAttrs.version}"; - hash = "sha256-wxjUL5mGXAMNVGP+dAh1NrE9tw71cJW9zmLsaCVphTo="; + tag = "v${finalAttrs.version}"; + hash = "sha256-D1huGKvYa/GsVeLQcP69MCWF8p+ytcQxlu0qynmYbGw="; }; nativeBuildInputs = [ @@ -37,26 +38,23 @@ stdenv.mkDerivation (finalAttrs: { qt6.qtsvg qt6.qttools qt6.qtdeclarative + libx11 libxfixes libxtst qt6.qtwayland wayland + miniaudio kdePackages.kconfig kdePackages.kstatusnotifieritem kdePackages.knotifications kdePackages.kguiaddons + kdePackages.qca + kdePackages.qtkeychain ]; cmakeFlags = [ (lib.cmakeBool "WITH_QT6" true) - ]; - - patches = [ - # https://github.com/hluk/CopyQ/pull/3268 - (fetchpatch2 { - url = "https://github.com/hluk/CopyQ/commit/103903593c37c9db5406d276e0097fbf18d2a8c4.patch?full_index=1"; - hash = "sha256-zywE6ntMw+WvTyilXwvd4lfQRAAB9R/AGpwtwwPFZZE="; - }) + (lib.cmakeFeature "MINIAUDIO_INCLUDE_DIR" "${lib.getInclude miniaudio}/include/miniaudio") ]; meta = {