Merge pull request #296823 from wineee/copyq

copyq:  7.1.0 -> 8.0.0
This commit is contained in:
Artturi 2024-03-18 18:32:20 +02:00 committed by GitHub
commit 847fde414f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch2
, cmake
, ninja
, extra-cmake-modules
@ -14,32 +13,24 @@
, qtwayland
, wayland
, wrapQtAppsHook
, kdePackages
}:
stdenv.mkDerivation rec {
pname = "CopyQ";
version = "7.1.0";
version = "8.0.0";
src = fetchFromGitHub {
owner = "hluk";
repo = "CopyQ";
rev = "v${version}";
hash = "sha256-aAmpFKIIFZLPWUaOcf4V1d/wVQ7xRcnXFsqFjROsabg=";
hash = "sha256-Ewunl4k9f0aDjilhKAsVxwR3S6uSZ1xwtu6ccNsNOgk=";
};
patches = [
# itemfakevim: fix build with qt 6.6.0
# https://github.com/hluk/CopyQ/pull/2508
(fetchpatch2 {
url = "https://github.com/hluk/CopyQ/commit/a20bfff0d78296b334ff8cabb047ab5d842b7311.patch";
hash = "sha256-F/6cQ8+O1Ttd4EFFxQas5ES6U+qxWdmYqUWRQLsVMa4=";
})
];
nativeBuildInputs = [
cmake
ninja
extra-cmake-modules
kdePackages.extra-cmake-modules
wrapQtAppsHook
];
@ -52,6 +43,9 @@ stdenv.mkDerivation rec {
libXtst
qtwayland
wayland
kdePackages.kconfig
kdePackages.kstatusnotifieritem
kdePackages.knotifications
];
postPatch = ''