diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index bb395236a66c..0e6025a2ee1b 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, ninja, qtbase, @@ -12,19 +13,20 @@ libXtst, qtwayland, wayland, + pkg-config, wrapQtAppsHook, kdePackages, }: stdenv.mkDerivation rec { pname = "CopyQ"; - version = "9.1.0"; + version = "10.0.0"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - hash = "sha256-WBJyLfiPPEQ/Cj5uuwy9KhVc1kw4Hv5TeEuRFDydlGk="; + hash = "sha256-lH3WJ6cK2eCnmcLVLnYUypABj73UZjGqqDPp92QE+V4="; }; nativeBuildInputs = [ @@ -32,6 +34,7 @@ stdenv.mkDerivation rec { ninja kdePackages.extra-cmake-modules wrapQtAppsHook + pkg-config ]; buildInputs = [ @@ -53,6 +56,15 @@ stdenv.mkDerivation rec { --replace copyq "$out/bin/copyq" ''; + patches = [ + (fetchpatch { + # Can be removed after next release + name = "fix-qchar-construction-for-qt-6.9.patch"; + url = "https://github.com/hluk/CopyQ/commit/f08c0d46a239362c5d3525ef9c3ba943bb00f734.patch"; + hash = "sha256-dsDIUVJHFFqzZ3tFOcYdwol/tm4viHM0CRs6wYfVKbQ="; + }) + ]; + cmakeFlags = [ "-DWITH_QT6=ON" ]; meta = with lib; {