diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-08-25 07:45:45 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-25 07:45:45 +0100 |
commit | 702c327c4260a435d5cbfa289224d782ba96dcf7 (patch) | |
tree | a55d4af616ac7506843a34cf369666617e14c6fb /pkgs | |
parent | cfaa4235e3e511bc45f71c1deef4d5654993ceec (diff) | |
parent | be8e1b99176b384e7576369060be88432bb18ede (diff) | |
download | nixlib-702c327c4260a435d5cbfa289224d782ba96dcf7.tar nixlib-702c327c4260a435d5cbfa289224d782ba96dcf7.tar.gz nixlib-702c327c4260a435d5cbfa289224d782ba96dcf7.tar.bz2 nixlib-702c327c4260a435d5cbfa289224d782ba96dcf7.tar.lz nixlib-702c327c4260a435d5cbfa289224d782ba96dcf7.tar.xz nixlib-702c327c4260a435d5cbfa289224d782ba96dcf7.tar.zst nixlib-702c327c4260a435d5cbfa289224d782ba96dcf7.zip |
Merge pull request #28534 from hedning/copyq_3.0.3
copyq: 2.9.0 -> 3.0.3
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/misc/copyq/cmake-modules.patch | 12 | ||||
-rw-r--r-- | pkgs/applications/misc/copyq/default.nix | 18 |
2 files changed, 25 insertions, 5 deletions
diff --git a/pkgs/applications/misc/copyq/cmake-modules.patch b/pkgs/applications/misc/copyq/cmake-modules.patch new file mode 100644 index 000000000000..f21105763de9 --- /dev/null +++ b/pkgs/applications/misc/copyq/cmake-modules.patch @@ -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) diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index 7461f6853f47..4fd30c547b5c 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -1,19 +1,27 @@ -{ stdenv, fetchFromGitHub, cmake, qt4, libXfixes, libXtst}: +{ stdenv, fetchFromGitHub, cmake, qt5, libXfixes, libXtst, git +, webkitSupport ? true +}: stdenv.mkDerivation rec { name = "CopyQ-${version}"; - version = "2.9.0"; + version = "3.0.3"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - sha256 = "1gnqsfh50w3qcnbghkpjr5qs42fgl6643lmg4mg4wam8a852s64f"; + sha256 = "0wpxqrg4mn8xjsrwsmlhh731s2kr6afnzpqif1way0gi7fqr73jl"; }; + patches = [ + ./cmake-modules.patch + ]; + nativeBuildInputs = [ cmake ]; - - buildInputs = [ qt4 libXfixes libXtst ]; + + buildInputs = [ + git qt5.full libXfixes libXtst + ] ++ stdenv.lib.optional webkitSupport qt5.qtwebkit; meta = with stdenv.lib; { homepage = https://hluk.github.io/CopyQ; |