pyrox.dev
Merge pull request #28534 from hedning/copyq_3.0.3
copyq: 2.9.0 -> 3.0.3
authored by Jörg Thalheim and committed by GitHub 702c327c cfaa4235
+12
pkgs/applications/misc/copyq/cmake-modules.patch
+12
pkgs/applications/misc/copyq/cmake-modules.patch
···
1
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
2
+
index d910299e..69888477 100644
3
+
--- a/src/CMakeLists.txt
4
+
+++ b/src/CMakeLists.txt
5
+
@@ -99,6 +99,7 @@ endif()
6
+
7
+
# Qt modules
8
+
if (WITH_QT5)
9
+
+ find_package(Qt5 REQUIRED COMPONENTS Network Svg Xml Script)
10
+
qt5_use_modules(copyq Widgets Network Svg Xml Script ${copyq_Qt5_Modules})
11
+
else()
12
+
set(QT_USE_QTNETWORK TRUE)
+13
-5
pkgs/applications/misc/copyq/default.nix
+13
-5
pkgs/applications/misc/copyq/default.nix
···
1
-
{ stdenv, fetchFromGitHub, cmake, qt4, libXfixes, libXtst}:
1
+
{ stdenv, fetchFromGitHub, cmake, qt5, libXfixes, libXtst, git
2
+
, webkitSupport ? true
3
+
}:
2
4
3
5
stdenv.mkDerivation rec {
4
6
name = "CopyQ-${version}";
5
-
version = "2.9.0";
7
+
version = "3.0.3";
6
8
7
9
src = fetchFromGitHub {
8
10
owner = "hluk";
9
11
repo = "CopyQ";
10
12
rev = "v${version}";
11
-
sha256 = "1gnqsfh50w3qcnbghkpjr5qs42fgl6643lmg4mg4wam8a852s64f";
13
+
sha256 = "0wpxqrg4mn8xjsrwsmlhh731s2kr6afnzpqif1way0gi7fqr73jl";
12
14
};
13
15
16
+
patches = [
17
+
./cmake-modules.patch
18
+
];
19
+
14
20
nativeBuildInputs = [ cmake ];
15
-
16
-
buildInputs = [ qt4 libXfixes libXtst ];
21
+
22
+
buildInputs = [
23
+
git qt5.full libXfixes libXtst
24
+
] ++ stdenv.lib.optional webkitSupport qt5.qtwebkit;
17
25
18
26
meta = with stdenv.lib; {
19
27
homepage = https://hluk.github.io/CopyQ;