ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-16 06:47:09 +03:00
Code Issues Projects Releases Wiki Activity

copyq: 3.0.3 -> 3.1.2

Browse Source
This commit is contained in:
Joerg Thalheim 2017-11-10 23:00:17 +00:00
parent 98fcc3bd5d
commit eb966a3b87
3 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/misc/copyq/cmake-modules.patch
View File

@ -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)

16
pkgs/applications/misc/copyq/default.nix
View File

@ -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 = [
./cmake-modules.patch
];
#patches = [
# ./cmake-modules.patch
#];
nativeBuildInputs = [ cmake ];
buildInputs = [
git qt5.full libXfixes libXtst
] ++ stdenv.lib.optional webkitSupport qt5.qtwebkit;
git qtbase qtscript libXfixes libXtst
] ++ stdenv.lib.optional webkitSupport qtwebkit;
meta = with stdenv.lib; {
homepage = https://hluk.github.io/CopyQ;

2
pkgs/top-level/all-packages.nix
View File

@ -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;