@@ -1,32 +1,68 @@
1−{ lib, mkDerivation, fetchFromGitHub, cmake
2−, qtbase, qtscript, qtwebkit, libXfixes, libXtst, qtx11extras, git
3−, webkitSupport ? true
1+{ lib
2+, mkDerivation
3+, fetchFromGitHub
4+, cmake
5+, extra-cmake-modules
6+, qtbase
7+, qtscript
8+, libXfixes
9+, libXtst
10+, qtx11extras
11+, git
12+, knotifications
13+, qtwayland
14+, wayland
15+, fetchpatch
416}:
517
618mkDerivation rec {
719 pname = "CopyQ";
8− version = "3.13.0";
20+ version = "4.1.0";
921
10− src = fetchFromGitHub {
22+ src = fetchFromGitHub {
1123 owner = "hluk";
1224 repo = "CopyQ";
1325 rev = "v${version}";
14− sha256 = "0qssyavx0dkgsyj2myqg8n7sih8niy960nyb1yknsbjm37iqraah";
26+ sha256 = "1iacnd9dn0mrajff80r2g5nlks5sch9lmpl633mnyqmih9dwx2li";
1527 };
1628
17− nativeBuildInputs = [ cmake ];
29+ nativeBuildInputs = [
30+ cmake
31+ extra-cmake-modules
32+ ];
1833
1934 buildInputs = [
20− git qtbase qtscript libXfixes libXtst qtx11extras
21− ] ++ lib.optional webkitSupport qtwebkit;
35+ qtbase
36+ qtscript
37+ libXfixes
38+ libXtst
39+ qtx11extras
40+ knotifications
41+ qtwayland
42+ wayland
43+ ];
44+
45+ patches = [
46+ # Install the bash completion script correctly
47+ # Remove once 4.1.1 is released
48+ (fetchpatch {
49+ url = "https://github.com/hluk/CopyQ/commit/aca7222ec28589af0b08f63686104b992d63ee42.patch";
50+ sha256 = "0d440d0zsdzm9cd0b6c42y9qbrvxg7gdam0qmif62mr8qa0ylidl";
51+ })
52+ ];
53+
54+ postPatch = ''
55+ substituteInPlace shared/com.github.hluk.copyq.desktop.in \
56+ --replace copyq "$out/bin/copyq"
57+ '';
2258
2359 meta = with lib; {
24− homepage = "https://hluk.github.io/CopyQ";
60+ homepage = "https://hluk.github.io/CopyQ";
2561 description = "Clipboard Manager with Advanced Features";
26− license = licenses.gpl3;
27− maintainers = [ maintainers.willtim ];
62+ license = licenses.gpl3Only;
63+ maintainers = with maintainers; [ willtim artturin ];
2864 # NOTE: CopyQ supports windows and osx, but I cannot test these.
2965 # OSX build requires QT5.
30− platforms = platforms.linux;
66+ platforms = platforms.linux;
3167 };
3268}