Merge pull request #28534 from hedning/copyq_3.0.3
copyq: 2.9.0 -> 3.0.3
This commit is contained in:
commit
702c327c42
12
pkgs/applications/misc/copyq/cmake-modules.patch
Normal file
12
pkgs/applications/misc/copyq/cmake-modules.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||||
|
index d910299e..69888477 100644
|
||||||
|
--- a/src/CMakeLists.txt
|
||||||
|
+++ b/src/CMakeLists.txt
|
||||||
|
@@ -99,6 +99,7 @@ endif()
|
||||||
|
|
||||||
|
# Qt modules
|
||||||
|
if (WITH_QT5)
|
||||||
|
+ find_package(Qt5 REQUIRED COMPONENTS Network Svg Xml Script)
|
||||||
|
qt5_use_modules(copyq Widgets Network Svg Xml Script ${copyq_Qt5_Modules})
|
||||||
|
else()
|
||||||
|
set(QT_USE_QTNETWORK TRUE)
|
@ -1,19 +1,27 @@
|
|||||||
{ stdenv, fetchFromGitHub, cmake, qt4, libXfixes, libXtst}:
|
{ stdenv, fetchFromGitHub, cmake, qt5, libXfixes, libXtst, git
|
||||||
|
, webkitSupport ? true
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "CopyQ-${version}";
|
name = "CopyQ-${version}";
|
||||||
version = "2.9.0";
|
version = "3.0.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "hluk";
|
owner = "hluk";
|
||||||
repo = "CopyQ";
|
repo = "CopyQ";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1gnqsfh50w3qcnbghkpjr5qs42fgl6643lmg4mg4wam8a852s64f";
|
sha256 = "0wpxqrg4mn8xjsrwsmlhh731s2kr6afnzpqif1way0gi7fqr73jl";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
./cmake-modules.patch
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
||||||
buildInputs = [ qt4 libXfixes libXtst ];
|
buildInputs = [
|
||||||
|
git qt5.full libXfixes libXtst
|
||||||
|
] ++ stdenv.lib.optional webkitSupport qt5.qtwebkit;
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
homepage = https://hluk.github.io/CopyQ;
|
homepage = https://hluk.github.io/CopyQ;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user