copyq: 3.0.3 -> 3.1.2

pkgs/applications/misc/copyq/cmake-modules.patch

@@ -1,12 +0,0 @@
-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)

pkgs/applications/misc/copyq/default.nix

@@ -1,27 +1,27 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, libXfixes, libXtst, git
+{ stdenv, fetchFromGitHub, cmake, qtbase, qtscript, qtwebkit, libXfixes, libXtst, git
 , webkitSupport ? true
 }:
 
 stdenv.mkDerivation rec {
   name = "CopyQ-${version}";
-  version = "3.0.3";
+  version = "3.1.2";
 
   src  = fetchFromGitHub {
     owner = "hluk";
     repo = "CopyQ";
     rev = "v${version}";
-    sha256 = "0wpxqrg4mn8xjsrwsmlhh731s2kr6afnzpqif1way0gi7fqr73jl";
+    sha256 = "0gdx1bqqqr4fk6wcrxqm9li6z48j1w84wjwyjpzp2cjzg96bp6bl";
   };
 
-  patches = [
+  #patches = [
-    ./cmake-modules.patch
+  #  ./cmake-modules.patch
-  ];
+  #];
 
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [
-    git qt5.full libXfixes libXtst
+    git qtbase qtscript libXfixes libXtst
-  ] ++ stdenv.lib.optional webkitSupport qt5.qtwebkit;
+  ] ++ stdenv.lib.optional webkitSupport qtwebkit;
 
   meta = with stdenv.lib; {
     homepage    = https://hluk.github.io/CopyQ;

pkgs/top-level/all-packages.nix

@@ -14064,7 +14064,7 @@ with pkgs;
 
   confclerk = callPackage ../applications/misc/confclerk { };
 
-  copyq = callPackage ../applications/misc/copyq { };
+  copyq = libsForQt5.callPackage ../applications/misc/copyq { };
 
   coriander = callPackage ../applications/video/coriander {
     inherit (gnome2) libgnomeui GConf;