pyrox.dev
Merge pull request #130670 from Artturin/update-copyq
CopyQ: 3.13.0 -> 4.1.0
+49
-13
pkgs/applications/misc/copyq/default.nix
+49
-13
pkgs/applications/misc/copyq/default.nix
···
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
4
16
}:
5
17
6
18
mkDerivation rec {
7
19
pname = "CopyQ";
8
-
version = "3.13.0";
20
+
version = "4.1.0";
9
21
10
-
src = fetchFromGitHub {
22
+
src = fetchFromGitHub {
11
23
owner = "hluk";
12
24
repo = "CopyQ";
13
25
rev = "v${version}";
14
-
sha256 = "0qssyavx0dkgsyj2myqg8n7sih8niy960nyb1yknsbjm37iqraah";
26
+
sha256 = "1iacnd9dn0mrajff80r2g5nlks5sch9lmpl633mnyqmih9dwx2li";
15
27
};
16
28
17
-
nativeBuildInputs = [ cmake ];
29
+
nativeBuildInputs = [
30
+
cmake
31
+
extra-cmake-modules
32
+
];
18
33
19
34
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
+
'';
22
58
23
59
meta = with lib; {
24
-
homepage = "https://hluk.github.io/CopyQ";
60
+
homepage = "https://hluk.github.io/CopyQ";
25
61
description = "Clipboard Manager with Advanced Features";
26
-
license = licenses.gpl3;
27
-
maintainers = [ maintainers.willtim ];
62
+
license = licenses.gpl3Only;
63
+
maintainers = with maintainers; [ willtim artturin ];
28
64
# NOTE: CopyQ supports windows and osx, but I cannot test these.
29
65
# OSX build requires QT5.
30
-
platforms = platforms.linux;
66
+
platforms = platforms.linux;
31
67
};
32
68
}
+1
-1
pkgs/top-level/all-packages.nix
+1
-1
pkgs/top-level/all-packages.nix
···
23449
23449
23450
23450
confclerk = callPackage ../applications/misc/confclerk { };
23451
23451
23452
-
copyq = libsForQt514.callPackage ../applications/misc/copyq { };
23452
+
copyq = libsForQt5.callPackage ../applications/misc/copyq { };
23453
23453
23454
23454
corectrl = libsForQt5.callPackage ../applications/misc/corectrl { };
23455
23455